src/ikj/main/ioke/lang/util/ObjectProxyCache.java @@ -8,18 +8,41 @@ import java.util.Map; import java.util.IdentityHashMap; import ioke.lang.exceptions.ControlFlow; -import ioke.lang.util.WeakIdentityHashMap; +import ioke.lang.util.ObjectProxyCache; /** * * @author <a href="mailto:ola.bini@gmail.com">Ola Bini</a> */ public class IokeRegistry { + private static interface Creator { + IokeObject create(Object javaObject); + } + public Runtime runtime; - private Map wrappedObjects = new WeakIdentityHashMap(); + private Creator regularCreator; + private Creator integratedCreator; - public IokeRegistry(Runtime runtime) { + private final ObjectProxyCache<IokeObject, Creator> wrappedObjects = + new ObjectProxyCache<IokeObject, Creator>(ObjectProxyCache.ReferenceType.WEAK) { + + public IokeObject allocateProxy(Object javaObject, Creator creator) { + return creator.create(javaObject); + } + }; + + public IokeRegistry(final Runtime runtime) { this.runtime = runtime; + this.regularCreator = new Creator() { + public IokeObject create(Object javaObject) { + return runtime.createJavaWrapper(javaObject); + } + }; + this.integratedCreator = new Creator() { + public IokeObject create(Object javaObject) { + return runtime.createIntegratedJavaWrapper((Class)javaObject); + } + }; } public static void makeWrapped(Object on, IokeObject wrapped, IokeObject context) { @@ -39,12 +62,7 @@ public class IokeRegistry { return ((Boolean)on).booleanValue() ? runtime._true : runtime._false; } - IokeObject obj = (IokeObject)wrappedObjects.get(on); - if(obj == null) { - obj = runtime.createJavaWrapper(on); - wrappedObjects.put(on, obj); - } - return obj; + return wrappedObjects.getOrCreate(on, regularCreator); } public IokeObject integratedWrap(Class on) { @@ -52,16 +70,11 @@ public class IokeRegistry { return runtime.nil; } - IokeObject obj = (IokeObject)wrappedObjects.get(on); - if(obj == null) { - obj = runtime.createIntegratedJavaWrapper(on); - wrappedObjects.put(on, obj); - } - return obj; + return wrappedObjects.getOrCreate(on, integratedCreator); } public boolean isWrapped(Object on) { - return wrappedObjects.containsKey(on); + return wrappedObjects.get(on) != null; } public static boolean isWrapped(Object on, IokeObject context) { src/ikj/main/ioke/lang/IokeRegistry.java src/ikj/main/ioke/lang/util/GenericMap.java src/ikj/main/ioke/lang/util/WeakIdentityHashMap.java 4aaf43ab157c7c62cc4ab948894bafb7bf9a8b67 Ola Bini ola.bini@gmail.com http://github.com/olabini/ioke/commit/87e67975b9bb30a00dbef97b72088e7e4fb9f12a 87e67975b9bb30a00dbef97b72088e7e4fb9f12a 2009-06-01T12:07:24-07:00 2009-06-01T12:07:24-07:00 Fix memory leak by having a real ObjectProxyCache 8373fd7788e84b34fc51487a8fbbc1de1d238ca9 Ola Bini ola.bini@gmail.com