Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-14 06:16:46 +01:00
Code Issues Projects Releases Wiki Activity

Fix accumulation of weak reference keys (mem leak) in snapshot cache

Browse Source
This commit is contained in:
Mike Primm 2011-12-28 14:33:32 +08:00 committed by mikeprimm
parent bd92cc37bf
commit babc8cd073
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/dynmap/MapManager.java
View File

@ -1076,6 +1076,10 @@ public class MapManager {
if(saverestorepending) if(saverestorepending)
savePending(); savePending();
if(sscache != null) {
sscache.cleanup();
sscache = null;
}
} }
private HashMap<World, File> worldTileDirectories = new HashMap<World, File>(); private HashMap<World, File> worldTileDirectories = new HashMap<World, File>();

17
src/main/java/org/dynmap/utils/SnapshotCache.java
View File

@ -122,8 +122,10 @@ public class SnapshotCache {
private void processRefQueue() { private void processRefQueue() {
Reference<? extends ChunkSnapshot> ref; Reference<? extends ChunkSnapshot> ref;
while((ref = refqueue.poll()) != null) { while((ref = refqueue.poll()) != null) {
String k = snapcache.reverselookup.get(ref); String k = snapcache.reverselookup.remove(ref);
if(k != null) snapcache.remove(k); if(k != null) {
snapcache.remove(k);
}
} }
} }
/** /**
@ -141,5 +143,16 @@ public class SnapshotCache {
public void resetStats() { public void resetStats() {
cache_attempts = cache_success = 0; cache_attempts = cache_success = 0;
} }
/**
* Cleanup
*/
public void cleanup() {
if(snapcache != null) {
snapcache.clear();
snapcache.reverselookup.clear();
snapcache.reverselookup = null;
snapcache = null;
}
}
} }