Changeset 10965 in josm for trunk/src/org/openstreetmap/josm/data/cache

Timestamp:

2016-09-05T23:50:16+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S1226 - Method parameters, caught exceptions and foreach variables should not be reassigned

File:

• trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

@@ -201 +201 @@
         IDiskCacheAttributes ret;
         removeStaleFiles(cachePath + File.separator + cacheName, USE_BLOCK_CACHE.get() ? "_INDEX_v2" : "_BLOCK_v2");
-        cacheName = cacheName + (USE_BLOCK_CACHE.get() ? "_BLOCK_v2" : "_INDEX_v2");
+        String newCacheName = cacheName + (USE_BLOCK_CACHE.get() ? "_BLOCK_v2" : "_INDEX_v2");
 
         if (USE_BLOCK_CACHE.get()) {
@@ -211 +211 @@
              * wants to reduce the file size, (s)he may just go to preferences and there it should be handled (by removing old file)
              */
-            File diskCacheFile = new File(cachePath + File.separator + cacheName + ".data");
+            File diskCacheFile = new File(cachePath + File.separator + newCacheName + ".data");
             if (diskCacheFile.exists()) {
                 blockAttr.setMaxKeySize((int) Math.max(maxDiskObjects, diskCacheFile.length()/1024));
@@ -231 +231 @@
             ret.setDiskPath(cachePath);
         }
-        ret.setCacheName(cacheName);
+        ret.setCacheName(newCacheName);
 
         return ret;