svn commit: r1798126 - /tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java

[markt]

Author: markt
Date: Thu Jun  8 21:36:10 2017
New Revision: 1798126

URL: http://svn.apache.org/viewvc?rev=1798126&view=rev
Log:
Remove / deprecate unnecessary code

Modified:
    tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1798126&r1=1798125&r2=1798126&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Thu Jun  8 
21:36:10 2017
@@ -1072,9 +1072,9 @@ public class StandardWrapper extends Con
             processServletSecurityAnnotation(servlet.getClass());
 
             // Special handling for ContainerServlet instances
-            if ((servlet instanceof ContainerServlet) &&
-                    (isContainerProvidedServlet(servletClass) ||
-                            ((Context) getParent()).getPrivileged() )) {
+            // Note: The InstanceManager checks if the application is permitted
+            //       to load ContainerServlets
+            if (servlet instanceof ContainerServlet) {
                 ((ContainerServlet) servlet).setWrapper(this);
             }
 
@@ -1548,7 +1548,10 @@ public class StandardWrapper extends Con
      * server class loader.
      *
      * @param classname Name of the class to be checked
+     *
+     * @deprecated Unused. Will be removed in Tomcat 9
      */
+    @Deprecated
     protected boolean isContainerProvidedServlet(String classname) {
 
         if (classname.startsWith("org.apache.catalina.")) {



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