TUSCANY-3939: when a loaded contribution is unloaded use ClassLoaderUtil.releaseLoader to unloack the jar

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

2 files changed, 81 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
index a0889ee9d3..6b601da19d 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
@@ -21,6 +21,7 @@ package org.apache.tuscany.sca.impl;
 
 import java.io.Reader;
 import java.io.StringReader;
+import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -60,6 +61,8 @@ import org.apache.tuscany.sca.runtime.DomainRegistry;
 import org.apache.tuscany.sca.runtime.RuntimeProperties;
 import org.oasisopen.sca.NoSuchServiceException;
 
+import sun.misc.ClassLoaderUtil;
+
 public class NodeImpl implements Node {
     private static final Logger logger = Logger.getLogger(NodeImpl.class.getName());
 
@@ -77,6 +80,8 @@ public class NodeImpl implements Node {
     private boolean endpointsIncludeDomainName;
     private boolean quietLogging;
 
+    private boolean releaseOnUnload;
+
     public NodeImpl(Deployer deployer,
                      CompositeActivator compositeActivator,
                      DomainRegistry domainRegistry,
@@ -92,16 +97,27 @@ public class NodeImpl implements Node {
 
         domainRegistry.addContributionListener(new ContributionListener() {
             public void contributionUpdated(String uri) {
-                loadedContributions.remove(uri);
+                unloadContribution(uri);
             }
             public void contributionRemoved(String uri) {
-                loadedContributions.remove(uri);
+                unloadContribution(uri);
+            }
+            private void unloadContribution(String curi) {
+                Contribution c = loadedContributions.remove(curi);
+                if (releaseOnUnload && (c != null)) {
+                    ClassLoader cl = c.getClassLoader();
+                    if (cl instanceof URLClassLoader) {
+                        ClassLoaderUtil.releaseLoader((URLClassLoader)cl);
+                    }
+                }
             }
         });
 
         endpointsIncludeDomainName = !TuscanyRuntime.DEFAUL_DOMAIN_NAME.equals(domainRegistry.getDomainName());
         
         UtilityExtensionPoint utilities = extensionPointRegistry.getExtensionPoint(UtilityExtensionPoint.class);
+        this.releaseOnUnload = Boolean.parseBoolean(utilities.getUtility(RuntimeProperties.class).getProperties().getProperty(RuntimeProperties.RELEASE_ON_UNLOAD, "true"));
+
         this.quietLogging = Boolean.parseBoolean(utilities.getUtility(RuntimeProperties.class).getProperties().getProperty(RuntimeProperties.QUIET_LOGGING));
         if (logger.isLoggable(quietLogging? Level.FINE : Level.INFO)) logger.log(quietLogging? Level.FINE : Level.INFO, "domain: " + domainRegistry.getDomainName() + (!domainRegistry.getDomainName().equals(domainRegistry.getDomainURI()) ? "" : (" domainURI: " + domainRegistry.getDomainURI())));
     }
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/ClassLoaderReleaseTestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/ClassLoaderReleaseTestCase.java
new file mode 100644
index 0000000000..50f212ebf3
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/ClassLoaderReleaseTestCase.java
@@ -0,0 +1,63 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+ */

+package org.apache.tuscany.sca.runtime;

+

+import java.io.File;

+import java.io.FileInputStream;

+import java.io.FileOutputStream;

+import java.io.IOException;

+import java.io.InputStream;

+import java.io.OutputStream;

+import java.util.List;

+import java.util.Map;

+

+import junit.framework.Assert;

+

+import org.apache.tuscany.sca.Node;

+import org.apache.tuscany.sca.TuscanyRuntime;

+import org.junit.Test;

+

+public class ClassLoaderReleaseTestCase {

+

+    @Test

+    public void testInstallDeployable() throws IOException, ActivationException{

+        File f = copyFile("src/test/resources/sample-helloworld.jar");

+        Node node = TuscanyRuntime.runComposite(null, f.toURI().toURL().toString());

+        Assert.assertFalse(f.delete());

+        Map<String, List<String>> scuris = node.getStartedCompositeURIs();

+        node.stopCompositeAndUninstallUnused(scuris.keySet().iterator().next(), scuris.get(scuris.keySet().iterator().next()).get(0));

+        Assert.assertTrue(f.delete());

+    }

+    

+    private File copyFile(String fileName) throws IOException {

+        File f = new File(fileName);

+        File newFile = File.createTempFile(getClass().getName(), ".jar");

+        InputStream in = new FileInputStream(f);

+        OutputStream out = new FileOutputStream(newFile);

+        byte[] buf = new byte[1024];

+        int len;

+        while ((len = in.read(buf)) > 0) {

+            out.write(buf, 0, len);

+        }

+        in.close();

+        out.close();

+        return newFile;

+    }

+        

+}