From d354d951b8246d0bf053c274d541d51a925da7e3 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Thu, 16 Apr 2009 23:00:36 +0000 Subject: [PATCH] Small tweaks. Apply directly to the nipples. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5727 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/as/com/threerings/util/WeakValueHashMap.as | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/as/com/threerings/util/WeakValueHashMap.as b/src/as/com/threerings/util/WeakValueHashMap.as index 47bc05c7b..8731c9eb0 100644 --- a/src/as/com/threerings/util/WeakValueHashMap.as +++ b/src/as/com/threerings/util/WeakValueHashMap.as @@ -24,10 +24,10 @@ public class WeakValueHashMap extends HashMap override public function get (key :Object) :* { var result :* = super.get(key); - if (result is WeakReference) { // could also just be undefined + if (result is WeakReference) { // could also just be undefined or null result = WeakReference(result).get(); if (result === undefined) { - remove(key); + super.remove(key); } } return result; @@ -36,6 +36,7 @@ public class WeakValueHashMap extends HashMap /** @inheritDoc */ override public function put (key :Object, value :Object) :* { + // store nulls directly return unwrap(super.put(key, (value == null) ? null : new WeakReference(value))); }