changeset in /hg/icedtea6: 2009-07-07 Omair Majid <omajid at redh...

[Omair Majid]

changeset 742216fd1f8f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=742216fd1f8f
description:
	2009-07-07  Omair Majid  <omajid at redhat.com>

	    * rt/net/sourceforge/jnlp/resources/Messages.properties: Add
	    RNestedJarExtration.
	    * rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
	    (activateJar): Create parent directories for nested jars.

diffstat:

3 files changed, 12 insertions(+)
ChangeLog                                             |    7 +++++++
rt/net/sourceforge/jnlp/resources/Messages.properties |    1 +
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java  |    4 ++++

diffs (39 lines):

diff -r 051f9a48387c -r 742216fd1f8f ChangeLog
--- a/ChangeLog	Tue Jul 07 10:58:02 2009 +0200
+++ b/ChangeLog	Tue Jul 07 10:12:31 2009 -0400
@@ -1,3 +1,10 @@ 2009-07-07  Xerxes RÃ¥nby  <xerxes at zafen
+2009-07-07  Omair Majid  <omajid at redhat.com>
+
+	* rt/net/sourceforge/jnlp/resources/Messages.properties: Add
+	RNestedJarExtration.
+	* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+	(activateJar): Create parent directories for nested jars.
+
 2009-07-07  Xerxes RÃ¥nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
diff -r 051f9a48387c -r 742216fd1f8f rt/net/sourceforge/jnlp/resources/Messages.properties
--- a/rt/net/sourceforge/jnlp/resources/Messages.properties	Tue Jul 07 10:58:02 2009 +0200
+++ b/rt/net/sourceforge/jnlp/resources/Messages.properties	Tue Jul 07 10:12:31 2009 -0400
@@ -111,6 +111,7 @@ RDenyStopped=Stopped applications have n
 RDenyStopped=Stopped applications have no permissions.
 RExitNoApp=Can not exit the JVM because the current application cannot be determined.
 RNoLockDir=Unable to create locks directory ({0})
+RNestedJarExtration=Unable to extract nested jar.
 RUnexpected=Unexpected {0} at {1}
 
 # Boot options, message should be shorter than this ---------------->
diff -r 051f9a48387c -r 742216fd1f8f rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Jul 07 10:58:02 2009 +0200
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Jul 07 10:12:31 2009 -0400
@@ -521,6 +521,10 @@ public class JNLPClassLoader extends URL
                                     // with standard classloader methods)
 
                                     String extractedJarLocation = localFile.getParent() + "/" + je.getName();
+                                    File parentDir = new File(extractedJarLocation).getParentFile();
+                                    if (!parentDir.isDirectory() && !parentDir.mkdirs()) {
+                                        throw new RuntimeException(R("RNestedJarExtration"));
+                                    }
                                     FileOutputStream extractedJar = new FileOutputStream(extractedJarLocation);
                                     InputStream is = jarFile.getInputStream(je);