changeset 1956:6b9ccc0f74d2

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, 21 Jul 2010 18:45:51 -0400
parents b3f4988afff9
children 39e4a9ec4eb5
files ChangeLog rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
diffstat 2 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jul 21 18:40:30 2010 -0400
+++ b/ChangeLog	Wed Jul 21 18:45:51 2010 -0400
@@ -1,3 +1,8 @@
+2010-07-21  Deepak Bhole <dbhole@redhat.com>
+
+	* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (getInstance):
+	Collapse extention loaders into baseloader rather than vice-verse.
+
 2010-07-21  Deepak Bhole <dbhole@redhat.com>
 
 	* rt/net/sourceforge/jnlp/SecurityDesc.java: Converge all property
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Jul 21 18:40:30 2010 -0400
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Jul 21 18:45:51 2010 -0400
@@ -250,12 +250,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