Changeset 29731 in osm for applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java

Timestamp:

2013-06-29T09:32:08+02:00 (11 years ago)

Author:

akks

Message:

[JMapViewer]: fix rare NPE while cleaning cache, extracted cleaning-related interfaces from OsmFileCacheTileLoader

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java (modified) (5 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java

@@ -37 +37 @@
     }
 
+    @Override
     public void addTile(Tile tile) {
         CacheEntry entry = createCacheEntry(tile);
@@ -45 +46 @@
     }
 
+    @Override
     public Tile getTile(TileSource source, int x, int y, int z) {
         CacheEntry entry = hashtable.get(Tile.getTileKey(source, x, y, z));
@@ -90 +92 @@
     }
 
+    @Override
     public int getTileCount() {
         return hashtable.size();
@@ -166 +169 @@
          */
         public synchronized void addFirst(CacheEntry element) {
+            if (element == null) return;
             if (elementCount == 0) {
                 firstElement = element;
@@ -186 +190 @@
          */
         public synchronized void removeEntry(CacheEntry element) {
+            if (element == null) return;
             if (element.next != null) {
                 element.next.prev = element.prev;