Merge pull request #12 from n-lagomarsini/JAIEXT-25

[JAIEXT-25] Upgrade Guava version to 17.0
n-lagomarsini · Jun 24, 2014 · 189500b · 189500b
2 parents f0ef5ec + 8f6aa58
commit 189500b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...rent-tile-cache/src/main/java/it/geosolutions/concurrent/ConcurrentTileCacheMultiMap.java b/...rent-tile-cache/src/main/java/it/geosolutions/concurrent/ConcurrentTileCacheMultiMap.java
@@ -590,7 +590,11 @@ public int weigh(Object o, CachedTileImpl cti) {
                 });
         // Setting of the listener
         builder.removalListener(createListener(diagnosticEnabled));
-
+        // Enable statistics only when the diagnostic flag is set to true;
+        if(diagnosticEnabled){
+            builder.recordStats();
+        }
+
         if (LOGGER.isLoggable(Level.FINE)) {
             LOGGER.fine("Building Cache");
         }

diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
     <geotools.version>10-SNAPSHOT</geotools.version>
      <fork.javac>true</fork.javac>
     <javac.maxHeapSize>256M</javac.maxHeapSize>
-    <guava.version>11.0.1</guava.version>
+    <guava.version>17.0</guava.version>
   </properties>
 
   <!-- ======================================================== -->