From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 17 May 2006 12:51:41 +0000 (+0000)
Subject: - Use Integer.valueOf.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5b842a0070b18f8758ccd1e85d076ee46a6cf6d9;p=tomcat7.0

- 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 9a20f5bb9..f3f739cca 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -459,7 +459,7 @@ final class ApplicationDispatcher
                      origServletPath);
                 outerRequest.setAttribute
                     (ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
-                     new Integer(ApplicationFilterFactory.FORWARD));
+                     Integer.valueOf(ApplicationFilterFactory.FORWARD));
                 invoke(outerRequest, response);
             } else {
                 invoke(outerRequest, response);
@@ -517,7 +517,7 @@ final class ApplicationDispatcher
             if ( log.isDebugEnabled() )
                 log.debug(" Non-HTTP Include");
             request.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
-                                             new Integer(ApplicationFilterFactory.INCLUDE));
+                    Integer.valueOf(ApplicationFilterFactory.INCLUDE));
             request.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR, origServletPath);
             invoke(request, outerResponse);
         }
@@ -534,7 +534,7 @@ final class ApplicationDispatcher
             if (servletPath != null)
                 wrequest.setServletPath(servletPath);
             wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
-                                             new Integer(ApplicationFilterFactory.INCLUDE));
+                    Integer.valueOf(ApplicationFilterFactory.INCLUDE));
             wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR, origServletPath);
             invoke(outerRequest, outerResponse);
 
@@ -569,7 +569,7 @@ final class ApplicationDispatcher
             }
             
             wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
-                                             new Integer(ApplicationFilterFactory.INCLUDE));
+                    Integer.valueOf(ApplicationFilterFactory.INCLUDE));
             wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_REQUEST_PATH_ATTR, origServletPath);
             invoke(outerRequest, outerResponse);
 
diff --git a/java/org/apache/catalina/core/RestrictedServlets.properties b/java/org/apache/catalina/core/RestrictedServlets.properties
index 2f8245ee5..f7fb3b76e 100644
--- 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