TUSCANY-4034 - plug a few more potential memory leaks

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1303855 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 46 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index cb2c01f7d6..a597f8b1ee 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
@@ -149,4 +149,7 @@ public class CglibProxyFactory implements ProxyFactory {
 
     }
 
+    public void removeProxiesForContribution(ClassLoader contributionClassloader){
+       // do nothing, no cache to clear 
+    }
 }
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
index 049c73f258..3cb9445d2d 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
@@ -122,4 +122,7 @@ public class ExtensibleProxyFactory implements ProxyFactory {
         return interfaceFactory.isProxyClass(clazz) || (classFactory != null && classFactory.isProxyClass(clazz));
     }
 
+    public void removeProxiesForContribution(ClassLoader contributionClassloader){
+        // do nothing, no cache to clear 
+    }
 }
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index f2d272757d..8d9612315a 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
@@ -84,5 +84,13 @@ public interface ProxyFactory {
      * @return true if the class is a generated proxy class by this factory 
      */
     boolean isProxyClass(Class<?> clazz);
+    
+    /**
+     * Allow cached proxies to be removed when a contribution is removed. The proxy 
+     * cache holds the application interface so will pin the contribution classloader
+     * 
+     * @param contributionClassloader the classloader of the contribution being removed
+     */
+    void removeProxiesForContribution(ClassLoader contributionClassloader);
 
 }
diff --git a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
index a9a28d434a..7163357042 100644
--- a/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
+++ b/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKProxyFactory.java
@@ -24,11 +24,15 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Future;
 
+import javax.xml.bind.JAXBContext;
 import javax.xml.ws.AsyncHandler;
 import javax.xml.ws.Response;
 
@@ -213,4 +217,32 @@ public class JDKProxyFactory implements ProxyFactory, LifeCycleListener {
     public void stop() {
         cache.clear();
     }
+    
+    public void removeProxiesForContribution(ClassLoader contributionClassloader){
+        try {
+            synchronized(cache) {                
+                Set<Class<?>> objSet = cache.keySet();
+                List<Class<?>> toRemove = new ArrayList<Class<?>>();
+                Iterator<Class<?>> i = objSet.iterator();
+                loop:
+                while(i.hasNext()) {
+                    Class<?> cls = i.next();
+                    ClassLoader cl = cls.getClassLoader();
+                    while (cl != null){
+                        if (cl == contributionClassloader){
+                            toRemove.add(cls);
+                            break loop;
+                        }
+                        // take account of generated classes
+                        cl = cl.getParent();
+                    }
+                }
+                for (Class<?> cls : toRemove){
+                    cache.remove(cls);
+                }
+            }
+        } catch(Exception e) {
+            throw new ServiceRuntimeException(e);
+        }
+    }
 }