svn commit: r1790453 - in /tomcat/trunk/java/org/apache/jasper: runtime/PageContextImpl.java security/SecurityClassLoad.java

[markt]

Author: markt
Date: Thu Apr  6 20:25:01 2017
New Revision: 1790453

URL: http://svn.apache.org/viewvc?rev=1790453&view=rev
Log:
Refactor to reduce duplicate(ish) code

Modified:
    tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
    tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java

Modified: tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=1790453&r1=1790452&r2=1790453&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java Thu Apr  6 
20:25:01 2017
@@ -207,28 +207,7 @@ public class PageContextImpl extends Pag
 
     @Override
     public Object getAttribute(final String name) {
-
-        if (name == null) {
-            throw new NullPointerException(Localizer
-                    .getMessage("jsp.error.attribute.null_name"));
-        }
-
-        if (SecurityUtil.isPackageProtectionEnabled()) {
-            return AccessController.doPrivileged(
-                    new PrivilegedAction<Object>() {
-                @Override
-                public Object run() {
-                    return doGetAttribute(name);
-                }
-            });
-        } else {
-            return doGetAttribute(name);
-        }
-
-    }
-
-    private Object doGetAttribute(String name) {
-        return attributes.get(name);
+        return getAttribute(name, PAGE_SCOPE);
     }
 
     @Override

Modified: tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java?rev=1790453&r1=1790452&r2=1790453&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/security/SecurityClassLoad.java Thu Apr 
 6 20:25:01 2017
@@ -61,7 +61,6 @@ public final class SecurityClassLoad {
             loader.loadClass( basePackage + "runtime.PageContextImpl$8");
             loader.loadClass( basePackage + "runtime.PageContextImpl$9");
             loader.loadClass( basePackage + "runtime.PageContextImpl$10");
-            loader.loadClass( basePackage + "runtime.PageContextImpl$11");
 
             loader.loadClass( basePackage + "runtime.JspContextWrapper");
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org