svn commit: r407240 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core: ApplicationDispatcher.java RestrictedServlets.properties

[remm]

Author: remm
Date: Wed May 17 05:51:41 2006
New Revision: 407240

URL: http://svn.apache.org/viewcvs?rev=407240&view=rev
Log:
- Use Integer.valueOf.
- Update restricted list a bit.

Modified:
    
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
    
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/RestrictedServlets.properties

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=407240&r1=407239&r2=407240&view=diff
==============================================================================
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java 
Wed May 17 05:51:41 2006
@@ -459,7 +459,7 @@
                      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 @@
             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 @@
             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 @@
             }
             
             
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);
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/RestrictedServlets.properties
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/RestrictedServlets.properties?rev=407240&r1=407239&r2=407240&view=diff
==============================================================================
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/RestrictedServlets.properties
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/RestrictedServlets.properties
 Wed May 17 05:51:41 2006
@@ -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



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]