AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SoftReference rather than WeakReference, the former apparently being

Browse Source 
subtly more appropriate for what we're doing.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2642 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2003-06-05 17:32:03 +00:00
parent 52e5206ff4
commit d0ad3559cd
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/tile/TileSet.java
+8 -8
View File
@@ -1,5 +1,5 @@
//
// $Id: TileSet.java,v 1.55 2003/06/04 22:00:59 mdb Exp $
// $Id: TileSet.java,v 1.56 2003/06/05 17:32:03 mdb Exp $
package com.threerings.media.tile;
@@ -8,7 +8,7 @@ import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.io.Serializable;
import java.lang.ref.WeakReference;
import java.lang.ref.SoftReference;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -199,9 +199,9 @@ public abstract class TileSet
_key.tileSet = this;
_key.tileIndex = tileIndex;
_key.zations = zations;
WeakReference wref = (WeakReference)_atiles.get(_key);
if (wref != null) {
tile = (Tile)wref.get();
SoftReference sref = (SoftReference)_atiles.get(_key);
if (sref != null) {
tile = (Tile)sref.get();
}
}
@@ -211,7 +211,7 @@ public abstract class TileSet
tile.key = new Tile.Key(this, tileIndex, zations);
initTile(tile, tileIndex, zations);
synchronized (_atiles) {
_atiles.put(tile.key, new WeakReference(tile));
_atiles.put(tile.key, new SoftReference(tile));
}
}
@@ -375,8 +375,8 @@ public abstract class TileSet
// first total up the active tiles
Iterator iter = _atiles.values().iterator();
while (iter.hasNext()) {
WeakReference wref = (WeakReference)iter.next();
Tile tile = (Tile)wref.get();
SoftReference sref = (SoftReference)iter.next();
Tile tile = (Tile)sref.get();
if (tile != null) {
asize++;
amem += tile.getEstimatedMemoryUsage();