- Use Integer.valueOf.

- Update restricted list a bit.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@407240 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 9a20f5b..f3f739c 100644 (file)
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -459,7 +459,7 @@ final class ApplicationDispatcher
                      origServletPath);\r
                 outerRequest.setAttribute\r
                     (ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,\r
-                     new Integer(ApplicationFilterFactory.FORWARD));\r
+                     Integer.valueOf(ApplicationFilterFactory.FORWARD));\r
                 invoke(outerRequest, response);\r
             } else {\r
                 invoke(outerRequest, response);\r
@@ -517,7 +517,7 @@ final class ApplicationDispatcher
             if ( log.isDebugEnabled() )\r
                 log.debug(" Non-HTTP Include");\r
             request.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,\r
-                                             new Integer(ApplicationFilterFactory.INCLUDE));\r
+                    Integer.valueOf(ApplicationFilterFactory.INCLUDE));\r
             request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR, origServletPath);\r
             invoke(request, outerResponse);\r
         }\r
@@ -534,7 +534,7 @@ final class ApplicationDispatcher
             if (servletPath != null)\r
                 wrequest.setServletPath(servletPath);\r
             wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,\r
-                                             new Integer(ApplicationFilterFactory.INCLUDE));\r
+                    Integer.valueOf(ApplicationFilterFactory.INCLUDE));\r
             wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR, origServletPath);\r
             invoke(outerRequest, outerResponse);\r
 \r
@@ -569,7 +569,7 @@ final class ApplicationDispatcher
             }\r
             \r
             wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,\r
-                                             new Integer(ApplicationFilterFactory.INCLUDE));\r
+                    Integer.valueOf(ApplicationFilterFactory.INCLUDE));\r
             wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR, origServletPath);\r
             invoke(outerRequest, outerResponse);\r
 \r

diff --git a/java/org/apache/catalina/core/RestrictedServlets.properties b/java/org/apache/catalina/core/RestrictedServlets.properties
index 2f8245e..f7fb3b7 100644 (file)
--- a/java/org/apache/catalina/core/RestrictedServlets.properties
+++ b/java/org/apache/catalina/core/RestrictedServlets.properties
@@ -1,3 +1,4 @@
 org.apache.catalina.ssi.SSIServlet=restricted
 org.apache.catalina.servlets.CGIServlet=restricted
 org.apache.catalina.servlets.InvokerServlet=restricted
+org.apache.catalina.manager.JMXProxyServlet=restricted