# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1296581829 0
# Node ID 81f0a5e66d7171606c2ab9adf3010b07baa7d703
# Parent  ebeb56428409ac5fdf098302ccc439fc0d830733
Add module for FLYS artifacts

geo-backend/trunk@1283 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r ebeb56428409 -r 81f0a5e66d71 geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/CachingQueryExecutorFactory.java
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/CachingQueryExecutorFactory.java	Tue Nov 02 17:52:22 2010 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/CachingQueryExecutorFactory.java	Tue Feb 01 17:37:09 2011 +0000
@@ -43,7 +43,6 @@
 
     public CachingQueryExecutorFactory() {
         log.info("using SQL cache");
-
         init();
     }
 
@@ -55,17 +54,17 @@
                 "Wasn't able to initialize cache.");
             return;
         }
-        else {
-            String configFile = config.getCacheConfiguration();
-            manager = configFile != null
-                ? new CacheManager(configFile)
-                : new CacheManager();
-            manager.addCache(CACHE_NAME);
-            MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
-            ManagementService.registerMBeans(manager, mBeanServer, false, false, false, true);
-            CacheCleaner cc = new CacheCleaner();
-            cc.start();
-        }
+        String configFile = config.getCacheConfiguration();
+        manager = configFile != null
+            ? new CacheManager(configFile)
+            : new CacheManager();
+        manager.addCache(CACHE_NAME);
+        MBeanServer mBeanServer =
+            ManagementFactory.getPlatformMBeanServer();
+        ManagementService.registerMBeans(
+            manager, mBeanServer, false, false, false, true);
+        CacheCleaner cc = new CacheCleaner();
+        cc.start();
     }
 
     public QueryExecutor getQueryExecutor() {
diff -r ebeb56428409 -r 81f0a5e66d71 geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/DefaultQueryExceutor.java
--- a/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/DefaultQueryExceutor.java	Tue Nov 02 17:52:22 2010 +0000
+++ b/geo-backend/src/main/java/de/intevation/gnv/geobackend/base/query/DefaultQueryExceutor.java	Tue Feb 01 17:37:09 2011 +0000
@@ -98,7 +98,7 @@
                         log.info("-> Database query took " +
                             (end.getTime() - start.getTime()) + " ms.");
 
-                        cacheable = rs instanceof Uncacheable ? false : true;
+                        cacheable = !(rs instanceof Uncacheable);
 
                         returnValue = super.createResultCollection(rs);
                     }else{