submit for GF bug 24659612

ruolli · ruolli · commit 85707093bc98 · 2016-12-07T12:52:23.000Z
svn path=/branches/javax.servlet.jsp-2.2.5/; revision=1505
diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.glassfish.web</groupId>
     <artifactId>javax.servlet.jsp</artifactId>
-    <version>2.2.5</version>
+    <version>2.2.5-b01</version>
     <packaging>jar</packaging>
     <name>JSP implementation</name>
 
@@ -99,9 +99,9 @@
         </mailingList>
     </mailingLists>
     <scm>
-        <connection>scm:svn:https://svn.java.net/svn/jsp~svn/tags/javax.servlet.jsp-2.2.5</connection>
-        <developerConnection>scm:svn:https://svn.java.net/svn/jsp~svn/tags/javax.servlet.jsp-2.2.5</developerConnection>
-        <url>http://java.net/projects/jsp/sources/svn/show/tags/javax.servlet.jsp-2.2.5</url>
+        <connection>scm:svn:https://svn.java.net/svn/jsp~svn/tags/javax.servlet.jsp-2.2.5-b01</connection>
+        <developerConnection>scm:svn:https://svn.java.net/svn/jsp~svn/tags/javax.servlet.jsp-2.2.5-b01</developerConnection>
+        <url>http://java.net/projects/jsp/sources/svn/show/tags/javax.servlet.jsp-2.2.5-b01</url>
     </scm>
 
     <build>
diff --git a/src/main/java/org/apache/jasper/runtime/JspRuntimeLibrary.java b/src/main/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
@@ -101,35 +101,6 @@ public class JspRuntimeLibrary {
     private static final String JSP_EXCEPTION
 	= "javax.servlet.jsp.jspException";
 
-    protected static class PrivilegedIntrospectHelper
-	implements PrivilegedExceptionAction<Object> {
-
-	private Object bean;
-	private String prop;
-	private String value;
-	private ServletRequest request;
-	private String param;
-	private boolean ignoreMethodNF;
-
-        PrivilegedIntrospectHelper(Object bean, String prop,
-                                   String value, ServletRequest request,
-                                   String param, boolean ignoreMethodNF)
-        {
-	    this.bean = bean;
-	    this.prop = prop;
-	    this.value = value;
-            this.request = request;
-	    this.param = param;
-	    this.ignoreMethodNF = ignoreMethodNF;
-        }
-         
-        public Object run() throws JasperException {
-	    internalIntrospecthelper(
-                bean,prop,value,request,param,ignoreMethodNF);
-            return null;
-        }
-    }
-
     /**
      * Returns the value of the javax.servlet.error.exception request
      * attribute value, if present, otherwise the value of the
@@ -339,27 +310,6 @@ public static void introspecthelper(Object bean, String prop,
                                         String value, ServletRequest request,
                                         String param, boolean ignoreMethodNF)
                                         throws JasperException
-    {
-        if (Constants.IS_SECURITY_ENABLED) {
-            try {
-                PrivilegedIntrospectHelper dp =
-		    new PrivilegedIntrospectHelper(
-			bean,prop,value,request,param,ignoreMethodNF);
-                AccessController.doPrivileged(dp);
-            } catch( PrivilegedActionException pe) {
-                Exception e = pe.getException();
-                throw (JasperException)e;
-            }
-        } else {
-            internalIntrospecthelper(
-		bean,prop,value,request,param,ignoreMethodNF);
-        }
-    }
-
-    private static void internalIntrospecthelper(Object bean, String prop,
-					String value, ServletRequest request,
-					String param, boolean ignoreMethodNF) 
-					throws JasperException
     {
         Method method = null;
         Class type = null;
