Bug 327482 - OSGI app binaries do not inherit Java 2 securityv20101101

2 files changed, 3 insertions, 16 deletions

diff --git a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
index 944bdbce7..330302600 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
+++ b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/internal/jsp/jasper/JspClassLoader.java
@@ -15,8 +15,6 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.security.CodeSource;
-import java.security.PermissionCollection;
 import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.StringTokenizer;
@@ -63,11 +61,8 @@ public class JspClassLoader extends URLClassLoader {
 		}
 	};
 
-	private PermissionCollection permissions;
-
-	public JspClassLoader(Bundle bundle, PermissionCollection permissions) {
+	public JspClassLoader(Bundle bundle) {
 		super(new URL[0], new BundleProxyClassLoader(bundle, new BundleProxyClassLoader(JASPERBUNDLE, new JSPContextFinder(EMPTY_CLASSLOADER))));
-		this.permissions = permissions;
 		addBundleClassPathJars(bundle);
 		Bundle[] fragments = Activator.getFragments(bundle);
 		if (fragments != null) {
@@ -110,8 +105,4 @@ public class JspClassLoader extends URLClassLoader {
 	protected Class findClass(String name) throws ClassNotFoundException {
 		throw new ClassNotFoundException(name);
 	}
-
-	protected PermissionCollection getPermissions(CodeSource codesource) {
-		return permissions;
-	}
 }
diff --git a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
index 5f5121246..273cd6a8b 100644
--- a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
+++ b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
@@ -91,7 +91,6 @@ public class JspServlet extends HttpServlet {
 	private static final long serialVersionUID = -4110476909131707652L;
 	private Servlet jspServlet = new org.apache.jasper.servlet.JspServlet();
 	Bundle bundle;
-	BundlePermissionCollection bundlePermissions;
 	private URLClassLoader jspLoader;
 	String bundleResourcePath;
 	String alias;
@@ -100,10 +99,7 @@ public class JspServlet extends HttpServlet {
 		this.bundle = bundle;
 		this.bundleResourcePath = (bundleResourcePath == null || bundleResourcePath.equals("/")) ? "" : bundleResourcePath; //$NON-NLS-1$ //$NON-NLS-2$
 		this.alias = (alias == null || alias.equals("/")) ? null : alias; //$NON-NLS-1$
-		if (System.getSecurityManager() != null) {
-			bundlePermissions = new BundlePermissionCollection(bundle);
-		}
-		jspLoader = new JspClassLoader(bundle, bundlePermissions);
+		jspLoader = new JspClassLoader(bundle);
 	}
 
 	public JspServlet(Bundle bundle, String bundleResourcePath) {
@@ -124,7 +120,7 @@ public class JspServlet extends HttpServlet {
 					Object jspRuntimeContext = jspRuntimeContextField.get(jspServlet);
 					Field permissionCollectionField = jspRuntimeContext.getClass().getDeclaredField("permissionCollection"); //$NON-NLS-1$
 					permissionCollectionField.setAccessible(true);
-					permissionCollectionField.set(jspRuntimeContext, bundlePermissions);
+					permissionCollectionField.set(jspRuntimeContext, new BundlePermissionCollection(bundle));
 				} catch (Exception e) {
 					throw new ServletException("Cannot initialize JSPServlet. Failed to set JSPRuntimeContext permission collection."); //$NON-NLS-1$
 				}