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

[markt]

Author: markt
Date: Thu Apr  6 20:00:51 2017
New Revision: 1790447

URL: http://svn.apache.org/viewvc?rev=1790447&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=1790447&r1=1790446&r2=1790447&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:00:51 2017
@@ -278,31 +278,7 @@ public class PageContextImpl extends Pag
 
     @Override
     public void setAttribute(final String name, final Object attribute) {
-
-        if (name == null) {
-            throw new NullPointerException(Localizer
-                    .getMessage("jsp.error.attribute.null_name"));
-        }
-
-        if (SecurityUtil.isPackageProtectionEnabled()) {
-            AccessController.doPrivileged(new PrivilegedAction<Void>() {
-                @Override
-                public Void run() {
-                    doSetAttribute(name, attribute);
-                    return null;
-                }
-            });
-        } else {
-            doSetAttribute(name, attribute);
-        }
-    }
-
-    private void doSetAttribute(String name, Object attribute) {
-        if (attribute != null) {
-            attributes.put(name, attribute);
-        } else {
-            removeAttribute(name, PAGE_SCOPE);
-        }
+        setAttribute(name, attribute, 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=1790447&r1=1790446&r2=1790447&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:00:51 2017
@@ -62,7 +62,6 @@ public final class SecurityClassLoad {
             loader.loadClass( basePackage + "runtime.PageContextImpl$9");
             loader.loadClass( basePackage + "runtime.PageContextImpl$10");
             loader.loadClass( basePackage + "runtime.PageContextImpl$11");
-            loader.loadClass( basePackage + "runtime.PageContextImpl$12");
 
             loader.loadClass( basePackage + "runtime.JspContextWrapper");
 



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