changeset 2322:af0efa63ddfe

Fix issue that allowed unsigned code to use extension services without prompt. Collapse extention loaders into baseloader rather than vice-versa -- this makes it so that a loader is reported signed only if the main app is.
author Deepak Bhole <dbhole@redhat.com>
date Wed, 28 Jul 2010 15:23:50 -0400
parents b0e276df145d
children 0165a4d30876
files ChangeLog netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
diffstat 2 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jul 28 15:20:07 2010 -0400
+++ b/ChangeLog	Wed Jul 28 15:23:50 2010 -0400
@@ -1,3 +1,8 @@
+2010-07-21  Deepak Bhole <dbhole@redhat.com>
+
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (getInstance):
+	Collapse extention loaders into baseloader rather than vice-verse.
+
 2010-07-21  Deepak Bhole <dbhole@redhat.com>
 
 	* netx/net/sourceforge/jnlp/SecurityDesc.java: Converge all property
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Jul 28 15:20:07 2010 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Jul 28 15:23:50 2010 -0400
@@ -249,12 +249,10 @@
                         JNLPClassLoader extLoader = (JNLPClassLoader) urlToLoader.get(uniqueKey);
 
                         if (extLoader != null && extLoader != loader) {
-                            for (URL u : loader.getURLs())
-                                extLoader.addURL(u);
-                            for (File nativeDirectory: loader.getNativeDirectories())
-                                extLoader.addNativeDirectory(nativeDirectory);
-
-                            loader = extLoader;
+                            for (URL u : extLoader.getURLs())
+                                loader.addURL(u);
+                            for (File nativeDirectory: extLoader.getNativeDirectories())
+                                loader.addNativeDirectory(nativeDirectory);
                         }
 
                 // loader is now current + ext. But we also need to think of