svn commit: r835844 - /tuscany/sca-java-1.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java

[sl...@apache.org]

Author: slaws
Date: Fri Nov 13 13:28:16 2009
New Revision: 835844

URL: http://svn.apache.org/viewvc?rev=835844&view=rev
Log:
TUSCANY-3312 - correct previous fix to prevent memory leak on WeakHashMap

Modified:
    tuscany/sca-java-1.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java

Modified: tuscany/sca-java-1.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java?rev=835844&r1=835843&r2=835844&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java (original)
+++ tuscany/sca-java-1.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java Fri Nov 13 13:28:16 2009
@@ -18,6 +18,7 @@
  */
 package org.apache.tuscany.sca.core.invocation;
 
+import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Proxy;
@@ -33,7 +34,7 @@
      // This is a cache containing the proxy class constructor for each business interface.
      // This improves performance compared to calling Proxy.newProxyInstance()
      // every time that a proxy is needed.
-     private static WeakHashMap cache = new WeakHashMap<String, Object>();
+     private static WeakHashMap cache = new WeakHashMap<Class, WeakReference<Constructor>>();
      
      public static Object newProxyInstance(ClassLoader classloader, Class aclass[], InvocationHandler invocationhandler)
         throws IllegalArgumentException
@@ -42,15 +43,18 @@
             if(invocationhandler == null)
                 throw new NullPointerException();
             // Lookup cached constructor.  aclass[0] is the reference's business interface.
-            Constructor proxyCTOR;
+            Constructor proxyCTOR = null;
             synchronized(cache) {
-                proxyCTOR = (Constructor) cache.get(aclass[0].hashCode());
+                WeakReference<Constructor> ref = (WeakReference<Constructor>) cache.get(aclass[0]);
+                if (ref != null){
+                    proxyCTOR = ref.get();
+                }
             }
             if(proxyCTOR == null) {
                 Class proxyClass = getProxyClass(classloader, aclass);
                 proxyCTOR = proxyClass.getConstructor(constructorParams);
                 synchronized(cache){
-                    cache.put(aclass[0].hashCode(),proxyCTOR);
+                    cache.put(aclass[0],new WeakReference<Constructor>(proxyCTOR));
                 }
             }
             return proxyCTOR.newInstance(new Object[] { invocationhandler });