/hg/icedtea-web: 2 new changesets

[omajid at icedtea.classpath.org]

changeset 8018994ecabd in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=8018994ecabd
author: Omair Majid <omajid at redhat.com>
date: Wed Oct 20 09:49:01 2010 -0400

	avoid creating unecessary nativedirs; clean them on exit

	2010-10-20 Omair Majid <omajid at redhat.com>

	 * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
	(JNLPClassLoader): Call installShutdownHooks.
	(installShutdownHooks): New method. Installs a shutdown hook to
	recursively delete the contents of nativeDir. (activateNative):
	Only create a nativeDir if there are native libraries.


changeset 257297223569 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=257297223569
author: Omair Majid <omajid at redhat.com>
date: Wed Oct 20 10:04:25 2010 -0400

	do not encode cache file url when adding it to
	jarLocationSecurityMap

	2010-10-20 Omair Majid <omajid at redhat.com>

	 * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
	(initializeResources): Do not perform url encoding on the file url.
	Stay consistent with the unencoded urls used in getPermissions.


diffstat:

2 files changed, 56 insertions(+), 4 deletions(-)
ChangeLog                                              |   15 +++++
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |   45 ++++++++++++++--

diffs (109 lines):

diff -r 22bfb12deaf7 -r 257297223569 ChangeLog
--- a/ChangeLog	Wed Oct 20 14:34:41 2010 +0100
+++ b/ChangeLog	Wed Oct 20 10:04:25 2010 -0400
@@ -1,3 +1,18 @@ 2010-10-19  Deepak Bhole  <dbhole at redhat
+2010-10-20  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+	(initializeResources): Do not perform url encoding on the file url. Stay
+	consistent with the unencoded urls used in getPermissions.
+
+2010-10-20  Omair Majid  <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+	(JNLPClassLoader): Call installShutdownHooks.
+	(installShutdownHooks): New method. Installs a shutdown hook to
+	recursively delete the contents of nativeDir.
+	(activateNative): Only create a nativeDir if there are native
+	libraries.
+
 2010-10-19  Deepak Bhole  <dbhole at redhat.com>
 
 	* Makefile.am:
diff -r 22bfb12deaf7 -r 257297223569 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Oct 20 14:34:41 2010 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Oct 20 10:04:25 2010 -0400
@@ -59,6 +59,7 @@ import net.sourceforge.jnlp.cache.Update
 import net.sourceforge.jnlp.cache.UpdatePolicy;
 import net.sourceforge.jnlp.security.SecurityWarningDialog;
 import net.sourceforge.jnlp.tools.JarSigner;
+import net.sourceforge.jnlp.util.FileUtils;
 import sun.misc.JarIndex;
 
 /**
@@ -169,6 +170,41 @@ public class JNLPClassLoader extends URL
 
         setSecurity();
 
+        installShutdownHooks();
+
+    }
+
+    /**
+     * Install JVM shutdown hooks to clean up resources allocated by this
+     * ClassLoader.
+     */
+    private void installShutdownHooks() {
+        Runtime.getRuntime().addShutdownHook(new Thread() {
+            @Override
+            public void run() {
+                if (JNLPRuntime.isDebug()) {
+                    System.out.println("Cleaning up native directory" + nativeDir.getAbsolutePath());
+                }
+
+                /*
+                 * Delete only the native dir created by this classloader (if
+                 * there is one). Other classloaders (parent, peers) will all
+                 * cleanup things they created
+                 */
+                if (nativeDir != null) {
+                    try {
+                        FileUtils.recursiveDelete(nativeDir,
+                                new File(System.getProperty("java.io.tmpdir")));
+                    } catch (IOException e) {
+                        /*
+                         * failed to delete a file in tmpdir, no big deal (not
+                         * to mention that the VM is shutting down at this
+                         * point so no much we can do)
+                         */
+                    }
+                }
+            }
+        });
     }
 
     private void setSecurity() throws LaunchException {
@@ -424,7 +460,7 @@ public class JNLPClassLoader extends URL
 
                 for (JARDesc jarDesc: file.getResources().getJARs()) {
                         try {
-                                URL location = tracker.getCacheFile(jarDesc.getLocation()).toURI().toURL();
+                                URL location = tracker.getCacheFile(jarDesc.getLocation()).toURL();
                                 SecurityDesc jarSecurity = file.getSecurity();
 
                                 if (file instanceof PluginBridge) {
@@ -741,9 +777,6 @@ public class JNLPClassLoader extends URL
         if (localFile == null)
             return;
 
-        if (nativeDir == null)
-            nativeDir = getNativeDir();
-
         String[] librarySuffixes = { ".so", ".dylib", ".jnilib", ".framework", ".dll" };
 
         try {
@@ -770,10 +803,14 @@ public class JNLPClassLoader extends URL
                     continue;
                 }
 
+                if (nativeDir == null)
+                    nativeDir = getNativeDir();
+
                 File outFile = new File(nativeDir, name);
 
                 CacheUtil.streamCopy(jarFile.getInputStream(e),
                                      new FileOutputStream(outFile));
+
             }
         }
         catch (IOException ex) {