You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/10/22 23:08:52 UTC
svn commit: r1187787 [1/5] - /tomcat/trunk/java/org/apache/catalina/core/
Author: markt
Date: Sat Oct 22 21:08:51 2011
New Revision: 1187787
URL: http://svn.apache.org/viewvc?rev=1187787&view=rev
Log:
Whitespace removal from /java/org/apache/catalina/core
Modified:
tomcat/trunk/java/org/apache/catalina/core/AccessLogAdapter.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationJspConfigDescriptor.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/core/AsyncListenerWrapper.java
tomcat/trunk/java/org/apache/catalina/core/Constants.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/core/StandardThreadExecutor.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
tomcat/trunk/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/AccessLogAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AccessLogAdapter.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AccessLogAdapter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AccessLogAdapter.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -99,7 +99,7 @@ public class ApplicationContext
static {
STRICT_SERVLET_COMPLIANCE = Globals.STRICT_SERVLET_COMPLIANCE;
-
+
String requireSlash = System.getProperty(
"org.apache.catalina.core.ApplicationContext.GET_RESOURCE_REQUIRE_SLASH");
if (requireSlash == null) {
@@ -122,7 +122,7 @@ public class ApplicationContext
public ApplicationContext(StandardContext context) {
super();
this.context = context;
-
+
// Populate session tracking modes
populateSessionTrackingModes();
}
@@ -194,7 +194,7 @@ public class ApplicationContext
*/
private SessionCookieConfig sessionCookieConfig =
new ApplicationSessionCookieConfig();
-
+
/**
* Session tracking modes
*/
@@ -303,7 +303,7 @@ public class ApplicationContext
}
}
-
+
/**
* Return the main path associated with this context.
*/
@@ -311,7 +311,7 @@ public class ApplicationContext
public String getContextPath() {
return context.getPath();
}
-
+
/**
* Return the value of the specified initialization parameter, or
@@ -396,7 +396,7 @@ public class ApplicationContext
Wrapper wrapper = (Wrapper) context.findChild(name);
if (wrapper == null)
return (null);
-
+
return new ApplicationDispatcher(wrapper, null, null, null, null, name);
}
@@ -445,7 +445,7 @@ public class ApplicationContext
if (normalizedPath == null)
return (null);
- pos = normalizedPath.length();
+ pos = normalizedPath.length();
// Use the thread local URI and mapping data
DispatchData dd = dispatchData.get();
@@ -496,10 +496,10 @@ public class ApplicationContext
String pathInfo = mappingData.pathInfo.toString();
mappingData.recycle();
-
+
// Construct a RequestDispatcher to process this request
return new ApplicationDispatcher
- (wrapper, uriCC.toString(), wrapperPath, pathInfo,
+ (wrapper, uriCC.toString(), wrapperPath, pathInfo,
queryString, null);
}
@@ -524,7 +524,7 @@ public class ApplicationContext
!path.startsWith("/") && GET_RESOURCE_REQUIRE_SLASH)
throw new MalformedURLException(sm.getString(
"applicationContext.requestDispatcher.iae", path));
-
+
String normPath = RequestUtil.normalize(path);
if (normPath == null)
return (null);
@@ -724,7 +724,7 @@ public class ApplicationContext
@Override
@Deprecated
public void log(Exception exception, String message) {
-
+
context.getLogger().error(message, exception);
}
@@ -738,7 +738,7 @@ public class ApplicationContext
*/
@Override
public void log(String message, Throwable throwable) {
-
+
context.getLogger().error(message, throwable);
}
@@ -896,11 +896,11 @@ public class ApplicationContext
@Override
public FilterRegistration.Dynamic addFilter(String filterName,
String filterClass) throws IllegalStateException {
-
+
return addFilter(filterName, filterClass, null);
}
-
+
/**
* Add filter to context.
* @param filterName Name of filter to add
@@ -918,11 +918,11 @@ public class ApplicationContext
@Override
public FilterRegistration.Dynamic addFilter(String filterName,
Filter filter) throws IllegalStateException {
-
+
return addFilter(filterName, null, filter);
}
-
+
/**
* Add filter to context.
* @param filterName Name of filter to add
@@ -940,13 +940,13 @@ public class ApplicationContext
@Override
public FilterRegistration.Dynamic addFilter(String filterName,
Class<? extends Filter> filterClass) throws IllegalStateException {
-
+
return addFilter(filterName, filterClass.getName(), null);
}
private FilterRegistration.Dynamic addFilter(String filterName,
String filterClass, Filter filter) throws IllegalStateException {
-
+
if (!context.getState().equals(LifecycleState.STARTING_PREP)) {
//TODO Spec breaking enhancement to ignore this restriction
throw new IllegalStateException(
@@ -962,7 +962,7 @@ public class ApplicationContext
// {@link javax.servlet.annotation.WebListener}.
FilterDef filterDef = context.findFilterDef(filterName);
-
+
// Assume a 'complete' FilterRegistration is one that has a class and
// a name
if (filterDef == null) {
@@ -982,10 +982,10 @@ public class ApplicationContext
filterDef.setFilterClass(filter.getClass().getName());
filterDef.setFilter(filter);
}
-
+
return new ApplicationFilterRegistration(filterDef, context);
- }
-
+ }
+
@Override
public <T extends Filter> T createFilter(Class<T> c)
throws ServletException {
@@ -1016,7 +1016,7 @@ public class ApplicationContext
return new ApplicationFilterRegistration(filterDef, context);
}
-
+
/**
* Add servlet to context.
* @param servletName Name of servlet to add
@@ -1034,7 +1034,7 @@ public class ApplicationContext
@Override
public ServletRegistration.Dynamic addServlet(String servletName,
String servletClass) throws IllegalStateException {
-
+
return addServlet(servletName, servletClass, null);
}
@@ -1060,7 +1060,7 @@ public class ApplicationContext
return addServlet(servletName, null, servlet);
}
-
+
/**
* Add servlet to context.
* @param servletName Name of servlet to add
@@ -1085,14 +1085,14 @@ public class ApplicationContext
private ServletRegistration.Dynamic addServlet(String servletName,
String servletClass, Servlet servlet) throws IllegalStateException {
-
+
if (!context.getState().equals(LifecycleState.STARTING_PREP)) {
//TODO Spec breaking enhancement to ignore this restriction
throw new IllegalStateException(
sm.getString("applicationContext.addServlet.ise",
getContextPath()));
}
-
+
// TODO SERVLET3
// throw UnsupportedOperationException - if this context was passed to the
// {@link ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent)}
@@ -1101,7 +1101,7 @@ public class ApplicationContext
// {@link javax.servlet.annotation.WebListener}.
Wrapper wrapper = (Wrapper) context.findChild(servletName);
-
+
// Assume a 'complete' ServletRegistration is one that has a class and
// a name
if (wrapper == null) {
@@ -1158,10 +1158,10 @@ public class ApplicationContext
if (wrapper == null) {
return null;
}
-
+
return new ApplicationServletRegistration(wrapper, context);
}
-
+
/**
* By default {@link SessionTrackingMode#URL} is always supported, {@link
@@ -1178,15 +1178,15 @@ public class ApplicationContext
private void populateSessionTrackingModes() {
// URL re-writing is always enabled by default
- defaultSessionTrackingModes = EnumSet.of(SessionTrackingMode.URL);
+ defaultSessionTrackingModes = EnumSet.of(SessionTrackingMode.URL);
supportedSessionTrackingModes = EnumSet.of(SessionTrackingMode.URL);
-
+
if (context.getCookies()) {
defaultSessionTrackingModes.add(SessionTrackingMode.COOKIE);
supportedSessionTrackingModes.add(SessionTrackingMode.COOKIE);
}
- // SSL not enabled by default as it can only used on its own
+ // SSL not enabled by default as it can only used on its own
// Context > Host > Engine > Service
Service s = ((Engine) context.getParent().getParent()).getService();
Connector[] connectors = s.findConnectors();
@@ -1196,7 +1196,7 @@ public class ApplicationContext
supportedSessionTrackingModes.add(SessionTrackingMode.SSL);
break;
}
- }
+ }
}
/**
@@ -1233,7 +1233,7 @@ public class ApplicationContext
sm.getString("applicationContext.setSessionTracking.ise",
getContextPath()));
}
-
+
// Check that only supported tracking modes have been requested
for (SessionTrackingMode sessionTrackingMode : sessionTrackingModes) {
if (!supportedSessionTrackingModes.contains(sessionTrackingMode)) {
@@ -1251,7 +1251,7 @@ public class ApplicationContext
getContextPath()));
}
}
-
+
this.sessionTrackingModes = sessionTrackingModes;
}
@@ -1261,12 +1261,12 @@ public class ApplicationContext
if (parameters.containsKey(name)) {
return false;
}
-
+
parameters.put(name, value);
return true;
}
-
-
+
+
@Override
public void addListener(Class<? extends EventListener> listenerClass) {
EventListener listener;
@@ -1283,7 +1283,7 @@ public class ApplicationContext
@Override
public void addListener(String className) {
-
+
try {
Object obj = context.getInstanceManager().newInstance(className);
@@ -1316,7 +1316,7 @@ public class ApplicationContext
"applicationContext.addListener.iae.cnfe", className),
e);
}
-
+
}
@@ -1334,7 +1334,7 @@ public class ApplicationContext
// method of a {@link ServletContextListener} that was not declared
// in web.xml, a web-fragment or annotated with
// {@link javax.servlet.annotation.WebListener}.
-
+
boolean match = false;
if (t instanceof ServletContextAttributeListener ||
t instanceof ServletRequestListener ||
@@ -1343,16 +1343,16 @@ public class ApplicationContext
context.addApplicationEventListener(t);
match = true;
}
-
+
if (t instanceof HttpSessionListener
|| (t instanceof ServletContextListener &&
newServletContextListenerAllowed)) {
context.addApplicationLifecycleListener(t);
match = true;
}
-
+
if (match) return;
-
+
if (t instanceof ServletContextListener) {
throw new IllegalArgumentException(sm.getString(
"applicationContext.addListener.iae.sclNotAllowed",
@@ -1398,20 +1398,20 @@ public class ApplicationContext
@Override
public void declareRoles(String... roleNames) {
-
+
if (!context.getState().equals(LifecycleState.STARTING_PREP)) {
//TODO Spec breaking enhancement to ignore this restriction
throw new IllegalStateException(
sm.getString("applicationContext.addRole.ise",
getContextPath()));
}
-
+
if (roleNames == null) {
throw new IllegalArgumentException(
sm.getString("applicationContext.roles.iae",
getContextPath()));
}
-
+
for (String role : roleNames) {
if (role == null || "".equals(role)) {
throw new IllegalArgumentException(
@@ -1440,7 +1440,7 @@ public class ApplicationContext
new RuntimePermission("getClassLoader"));
}
}
-
+
return result;
}
@@ -1461,7 +1461,7 @@ public class ApplicationContext
public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
Map<String, ApplicationFilterRegistration> result =
new HashMap<String, ApplicationFilterRegistration>();
-
+
FilterDef[] filterDefs = context.findFilterDefs();
for (FilterDef filterDef : filterDefs) {
result.put(filterDef.getFilterName(),
@@ -1482,7 +1482,7 @@ public class ApplicationContext
public Map<String, ? extends ServletRegistration> getServletRegistrations() {
Map<String, ApplicationServletRegistration> result =
new HashMap<String, ApplicationServletRegistration>();
-
+
Container[] wrappers = context.findChildren();
for (Container wrapper : wrappers) {
result.put(((Wrapper) wrapper).getName(),
@@ -1493,12 +1493,12 @@ public class ApplicationContext
return result;
}
-
+
// -------------------------------------------------------- Package Methods
protected StandardContext getContext() {
return this.context;
}
-
+
protected Map<String,String> getReadonlyAttributes() {
return this.readOnlyAttributes;
}
@@ -1521,10 +1521,10 @@ public class ApplicationContext
String key = keys.next();
removeAttribute(key);
}
-
+
}
-
-
+
+
/**
* Return the facade associated with this ApplicationContext.
*/
@@ -1549,7 +1549,7 @@ public class ApplicationContext
protected void setNewServletContextListenerAllowed(boolean allowed) {
this.newServletContextListenerAllowed = allowed;
}
-
+
/**
* List resource paths (recursively), and store all of them in the given
* Set.
@@ -1580,13 +1580,13 @@ public class ApplicationContext
*/
private static String getJNDIUri(String hostName, String path) {
String result;
-
+
if (path.startsWith("/")) {
result = "/" + hostName + path;
} else {
result = "/" + hostName + "/" + path;
}
-
+
return result;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -59,20 +59,20 @@ import org.apache.tomcat.util.ExceptionU
*/
public class ApplicationContextFacade implements ServletContext {
-
+
// ---------------------------------------------------------- Attributes
/**
* Cache Class object used for reflection.
*/
private HashMap<String,Class<?>[]> classCache;
-
-
+
+
/**
* Cache method object.
*/
private HashMap<String,Method> objectCache;
-
-
+
+
// ----------------------------------------------------------- Constructors
@@ -85,13 +85,13 @@ public class ApplicationContextFacade im
public ApplicationContextFacade(ApplicationContext context) {
super();
this.context = context;
-
+
classCache = new HashMap<String,Class<?>[]>();
objectCache = new HashMap<String,Method>();
initClassCache();
}
-
-
+
+
private void initClassCache(){
Class<?>[] clazz = new Class[]{String.class};
classCache.put("getContext", clazz);
@@ -188,7 +188,7 @@ public class ApplicationContextFacade im
throws MalformedURLException {
if (Globals.IS_SECURITY_ENABLED) {
try {
- return (URL) invokeMethod(context, "getResource",
+ return (URL) invokeMethod(context, "getResource",
new Object[]{path});
} catch(Throwable t) {
if (t instanceof MalformedURLException){
@@ -205,7 +205,7 @@ public class ApplicationContextFacade im
@Override
public InputStream getResourceAsStream(String path) {
if (SecurityUtil.isPackageProtectionEnabled()) {
- return (InputStream) doPrivileged("getResourceAsStream",
+ return (InputStream) doPrivileged("getResourceAsStream",
new Object[]{path});
} else {
return context.getResourceAsStream(path);
@@ -216,7 +216,7 @@ public class ApplicationContextFacade im
@Override
public RequestDispatcher getRequestDispatcher(final String path) {
if (SecurityUtil.isPackageProtectionEnabled()) {
- return (RequestDispatcher) doPrivileged("getRequestDispatcher",
+ return (RequestDispatcher) doPrivileged("getRequestDispatcher",
new Object[]{path});
} else {
return context.getRequestDispatcher(path);
@@ -227,7 +227,7 @@ public class ApplicationContextFacade im
@Override
public RequestDispatcher getNamedDispatcher(String name) {
if (SecurityUtil.isPackageProtectionEnabled()) {
- return (RequestDispatcher) doPrivileged("getNamedDispatcher",
+ return (RequestDispatcher) doPrivileged("getNamedDispatcher",
new Object[]{name});
} else {
return context.getNamedDispatcher(name);
@@ -244,7 +244,7 @@ public class ApplicationContextFacade im
throws ServletException {
if (SecurityUtil.isPackageProtectionEnabled()) {
try {
- return (Servlet) invokeMethod(context, "getServlet",
+ return (Servlet) invokeMethod(context, "getServlet",
new Object[]{name});
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
@@ -307,7 +307,7 @@ public class ApplicationContextFacade im
@Deprecated
public void log(Exception exception, String msg) {
if (SecurityUtil.isPackageProtectionEnabled()) {
- doPrivileged("log", new Class[]{Exception.class, String.class},
+ doPrivileged("log", new Class[]{Exception.class, String.class},
new Object[]{exception,msg});
} else {
context.log(exception, msg);
@@ -318,7 +318,7 @@ public class ApplicationContextFacade im
@Override
public void log(String message, Throwable throwable) {
if (SecurityUtil.isPackageProtectionEnabled()) {
- doPrivileged("log", new Class[]{String.class, Throwable.class},
+ doPrivileged("log", new Class[]{String.class, Throwable.class},
new Object[]{message, throwable});
} else {
context.log(message, throwable);
@@ -349,7 +349,7 @@ public class ApplicationContextFacade im
@Override
public String getInitParameter(String name) {
if (SecurityUtil.isPackageProtectionEnabled()) {
- return (String) doPrivileged("getInitParameter",
+ return (String) doPrivileged("getInitParameter",
new Object[]{name});
} else {
return context.getInitParameter(name);
@@ -420,7 +420,7 @@ public class ApplicationContextFacade im
}
}
-
+
@Override
public String getContextPath() {
if (SecurityUtil.isPackageProtectionEnabled()) {
@@ -430,7 +430,7 @@ public class ApplicationContextFacade im
}
}
-
+
@Override
public FilterRegistration.Dynamic addFilter(String filterName,
String className) {
@@ -472,7 +472,7 @@ public class ApplicationContextFacade im
throws ServletException {
if (SecurityUtil.isPackageProtectionEnabled()) {
try {
- return (T) invokeMethod(context, "createFilter",
+ return (T) invokeMethod(context, "createFilter",
new Object[]{c});
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
@@ -496,8 +496,8 @@ public class ApplicationContextFacade im
return context.getFilterRegistration(filterName);
}
}
-
-
+
+
@Override
public ServletRegistration.Dynamic addServlet(String servletName,
String className) {
@@ -540,7 +540,7 @@ public class ApplicationContextFacade im
throws ServletException {
if (SecurityUtil.isPackageProtectionEnabled()) {
try {
- return (T) invokeMethod(context, "createServlet",
+ return (T) invokeMethod(context, "createServlet",
new Object[]{c});
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
@@ -554,7 +554,7 @@ public class ApplicationContextFacade im
}
}
-
+
@Override
public ServletRegistration getServletRegistration(String servletName) {
if (SecurityUtil.isPackageProtectionEnabled()) {
@@ -564,8 +564,8 @@ public class ApplicationContextFacade im
return context.getServletRegistration(servletName);
}
}
-
-
+
+
@Override
@SuppressWarnings("unchecked") // doPrivileged() returns the correct type
public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
@@ -662,7 +662,7 @@ public class ApplicationContextFacade im
throws ServletException {
if (SecurityUtil.isPackageProtectionEnabled()) {
try {
- return (T) invokeMethod(context, "createListener",
+ return (T) invokeMethod(context, "createListener",
new Object[]{c});
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
@@ -756,7 +756,7 @@ public class ApplicationContextFacade im
}
/**
- * Use reflection to invoke the requested method. Cache the method object
+ * Use reflection to invoke the requested method. Cache the method object
* to speed up the process
* @param methodName The method to call.
* @param params The arguments passed to the called method.
@@ -769,9 +769,9 @@ public class ApplicationContextFacade im
}
}
-
+
/**
- * Use reflection to invoke the requested method. Cache the method object
+ * Use reflection to invoke the requested method. Cache the method object
* to speed up the process
* @param appContext The AppliationContext object on which the method
* will be invoked
@@ -779,8 +779,8 @@ public class ApplicationContextFacade im
* @param params The arguments passed to the called method.
*/
private Object invokeMethod(ApplicationContext appContext,
- final String methodName,
- Object[] params)
+ final String methodName,
+ Object[] params)
throws Throwable{
try{
@@ -790,7 +790,7 @@ public class ApplicationContextFacade im
.getMethod(methodName, classCache.get(methodName));
objectCache.put(methodName, method);
}
-
+
return executeMethod(method,appContext,params);
} catch (Exception ex){
handleException(ex);
@@ -799,15 +799,15 @@ public class ApplicationContextFacade im
params = null;
}
}
-
+
/**
- * Use reflection to invoke the requested method. Cache the method object
+ * Use reflection to invoke the requested method. Cache the method object
* to speed up the process
* @param methodName The method to invoke.
* @param clazz The class where the method is.
* @param params The arguments passed to the called method.
- */
- private Object doPrivileged(final String methodName,
+ */
+ private Object doPrivileged(final String methodName,
final Class<?>[] clazz,
Object[] params) {
@@ -826,8 +826,8 @@ public class ApplicationContextFacade im
params = null;
}
}
-
-
+
+
/**
* Executes the method of the specified <code>ApplicationContext</code>
* @param method The method object to be invoked.
@@ -835,13 +835,13 @@ public class ApplicationContextFacade im
* will be invoked
* @param params The arguments passed to the called method.
*/
- private Object executeMethod(final Method method,
+ private Object executeMethod(final Method method,
final ApplicationContext context,
- final Object[] params)
- throws PrivilegedActionException,
+ final Object[] params)
+ throws PrivilegedActionException,
IllegalAccessException,
InvocationTargetException {
-
+
if (SecurityUtil.isPackageProtectionEnabled()){
return AccessController.doPrivileged(new PrivilegedExceptionAction<Object>(){
@Override
@@ -851,10 +851,10 @@ public class ApplicationContextFacade im
});
} else {
return method.invoke(context, params);
- }
+ }
}
-
+
/**
*
* Throw the real exception.
@@ -864,18 +864,18 @@ public class ApplicationContextFacade im
throws Throwable {
Throwable realException;
-
+
if (ex instanceof PrivilegedActionException) {
ex = ((PrivilegedActionException) ex).getException();
}
-
+
if (ex instanceof InvocationTargetException) {
realException =
((InvocationTargetException) ex).getTargetException();
} else {
realException = ex;
- }
-
+ }
+
throw realException;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -74,7 +74,7 @@ final class ApplicationDispatcher
static {
STRICT_SERVLET_COMPLIANCE = Globals.STRICT_SERVLET_COMPLIANCE;
-
+
String wrapSameObject = System.getProperty(
"org.apache.catalina.core.ApplicationDispatcher.WRAP_SAME_OBJECT");
if (wrapSameObject == null) {
@@ -118,13 +118,13 @@ final class ApplicationDispatcher
@Override
public Void run() throws ServletException, IOException {
DispatcherType type = DispatcherType.INCLUDE;
- if (request.getDispatcherType()==DispatcherType.ASYNC) type = DispatcherType.ASYNC;
+ if (request.getDispatcherType()==DispatcherType.ASYNC) type = DispatcherType.ASYNC;
doInclude(request,response,type);
return null;
}
}
-
+
/**
* Used to pass state when the request dispatcher is used. Using instance
* variables causes threading issues and state is too complex to pass and
@@ -148,7 +148,7 @@ final class ApplicationDispatcher
* The outermost response that will be passed on to the invoked servlet.
*/
ServletResponse outerResponse = null;
-
+
/**
* The request wrapper we have created and installed (if any).
*/
@@ -159,7 +159,7 @@ final class ApplicationDispatcher
* The response wrapper we have created and installed (if any).
*/
ServletResponse wrapResponse = null;
-
+
/**
* Are we performing an include() instead of a forward()?
*/
@@ -313,7 +313,7 @@ final class ApplicationDispatcher
private void doForward(ServletRequest request, ServletResponse response)
throws ServletException, IOException
{
-
+
// Reset any output that has been buffered, but keep headers/cookies
if (response.isCommitted()) {
throw new IllegalStateException
@@ -369,7 +369,7 @@ final class ApplicationDispatcher
wrequest.setAttribute(RequestDispatcher.FORWARD_QUERY_STRING,
hrequest.getQueryString());
}
-
+
wrequest.setContextPath(contextPath);
wrequest.setRequestURI(requestURI);
wrequest.setServletPath(servletPath);
@@ -390,9 +390,9 @@ final class ApplicationDispatcher
((ResponseFacade) response).finish();
} else {
// Servlet SRV.6.2.2. The Request/Response may have been wrapped
- // and may no longer be instance of RequestFacade
+ // and may no longer be instance of RequestFacade
if (wrapper.getLogger().isDebugEnabled()){
- wrapper.getLogger().debug( " The Response is vehiculed using a wrapper: "
+ wrapper.getLogger().debug( " The Response is vehiculed using a wrapper: "
+ response.getClass().getName() );
}
@@ -416,7 +416,7 @@ final class ApplicationDispatcher
}
-
+
/**
* Prepare the request based on the filter configuration.
* @param request The servlet request we are processing
@@ -426,15 +426,15 @@ final class ApplicationDispatcher
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
*/
- private void processRequest(ServletRequest request,
+ private void processRequest(ServletRequest request,
ServletResponse response,
State state)
throws IOException, ServletException {
-
+
DispatcherType disInt = (DispatcherType) request.getAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR);
if (disInt != null) {
boolean doInvoke = true;
-
+
if (context.getFireRequestListenersOnForwards() &&
!context.fireRequestInitEvent(request)) {
doInvoke = false;
@@ -452,15 +452,15 @@ final class ApplicationDispatcher
} else {
invoke(state.outerRequest, response, state);
}
-
+
if (context.getFireRequestListenersOnForwards()) {
context.fireRequestDestroyEvent(request);
}
}
}
}
-
-
+
+
/**
* Combine the servletPath and the pathInfo. If pathInfo is
* <code>null</code> it is ignored. If servletPath is <code>null</code> then
@@ -506,7 +506,7 @@ final class ApplicationDispatcher
}
} else {
DispatcherType type = DispatcherType.INCLUDE;
- if (request.getDispatcherType()==DispatcherType.ASYNC) type = DispatcherType.ASYNC;
+ if (request.getDispatcherType()==DispatcherType.ASYNC) type = DispatcherType.ASYNC;
doInclude(request,response,type);
}
}
@@ -521,7 +521,7 @@ final class ApplicationDispatcher
// Check SRV.8.2 / SRV.14.2.5.1 compliance
checkSameObjects(request, response);
}
-
+
// Create a wrapped response to use for this request
wrapResponse(state);
@@ -564,7 +564,7 @@ final class ApplicationDispatcher
queryString);
wrequest.setQueryParams(queryString);
}
-
+
wrequest.setAttribute(ApplicationFilterFactory.DISPATCHER_TYPE_ATTR,
type);
wrequest.setAttribute(
@@ -620,7 +620,7 @@ final class ApplicationDispatcher
// Check for the servlet being marked unavailable
if (wrapper.isUnavailable()) {
wrapper.getLogger().warn(
- sm.getString("applicationDispatcher.isUnavailable",
+ sm.getString("applicationDispatcher.isUnavailable",
wrapper.getName()));
long available = wrapper.getAvailable();
if ((available > 0L) && (available < Long.MAX_VALUE))
@@ -649,12 +649,12 @@ final class ApplicationDispatcher
wrapper.getName()), e);
servlet = null;
}
-
+
// Get the FilterChain Here
ApplicationFilterFactory factory = ApplicationFilterFactory.getInstance();
ApplicationFilterChain filterChain = factory.createFilterChain(request,
wrapper,servlet);
-
+
// Call the service() method for the allocated servlet instance
try {
support.fireInstanceEvent(InstanceEvent.BEFORE_DISPATCH_EVENT,
@@ -732,14 +732,14 @@ final class ApplicationDispatcher
// Reset the old context class loader
if (oldCCL != null)
Thread.currentThread().setContextClassLoader(oldCCL);
-
+
// Unwrap request/response if needed
// See Bugzilla 30949
unwrapRequest(state);
unwrapResponse(state);
// Recycle request if necessary (also BZ 30949)
recycleRequestWrapper(state);
-
+
// Rethrow an exception if one was thrown by the invoked servlet
if (ioException != null)
throw ioException;
@@ -786,7 +786,7 @@ final class ApplicationDispatcher
}
}
-
+
/**
* Unwrap the response if we have wrapped it.
*/
@@ -857,7 +857,7 @@ final class ApplicationDispatcher
if ((state.outerRequest instanceof ApplicationHttpRequest) ||
(state.outerRequest instanceof Request) ||
(state.outerRequest instanceof HttpServletRequest)) {
- HttpServletRequest houterRequest =
+ HttpServletRequest houterRequest =
(HttpServletRequest) state.outerRequest;
Object contextPath = houterRequest.getAttribute(
RequestDispatcher.INCLUDE_CONTEXT_PATH);
@@ -932,15 +932,15 @@ final class ApplicationDispatcher
ApplicationFilterChain.getLastServicedRequest();
ServletResponse originalResponse =
ApplicationFilterChain.getLastServicedResponse();
-
- // Some forwards, eg from valves will not set original values
+
+ // Some forwards, eg from valves will not set original values
if (originalRequest == null || originalResponse == null) {
return;
}
-
+
boolean same = false;
ServletRequest dispatchedRequest = appRequest;
-
+
//find the request that was passed into the service method
while (originalRequest instanceof ServletRequestWrapper &&
((ServletRequestWrapper) originalRequest).getRequest()!=null ) {
@@ -963,13 +963,13 @@ final class ApplicationDispatcher
throw new ServletException(sm.getString(
"applicationDispatcher.specViolation.request"));
}
-
+
same = false;
ServletResponse dispatchedResponse = appResponse;
-
+
//find the response that was passed into the service method
while (originalResponse instanceof ServletResponseWrapper &&
- ((ServletResponseWrapper) originalResponse).getResponse() !=
+ ((ServletResponseWrapper) originalResponse).getResponse() !=
null ) {
originalResponse =
((ServletResponseWrapper) originalResponse).getResponse();
@@ -979,7 +979,7 @@ final class ApplicationDispatcher
if (originalResponse.equals(dispatchedResponse)) {
same = true;
}
-
+
if (!same && dispatchedResponse instanceof ServletResponseWrapper) {
dispatchedResponse =
((ServletResponseWrapper) dispatchedResponse).getResponse();
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -95,12 +95,12 @@ final class ApplicationFilterChain imple
/**
* Filters.
*/
- private ApplicationFilterConfig[] filters =
+ private ApplicationFilterConfig[] filters =
new ApplicationFilterConfig[0];
/**
- * The int which is used to maintain the current position
+ * The int which is used to maintain the current position
* in the filter chain.
*/
private int pos = 0;
@@ -131,35 +131,35 @@ final class ApplicationFilterChain imple
*/
private InstanceSupport support = null;
-
+
/**
- * Static class array used when the SecurityManager is turned on and
+ * Static class array used when the SecurityManager is turned on and
* <code>doFilter</code> is invoked.
*/
- private static Class<?>[] classType = new Class[]{ServletRequest.class,
+ private static Class<?>[] classType = new Class[]{ServletRequest.class,
ServletResponse.class,
FilterChain.class};
-
+
/**
- * Static class array used when the SecurityManager is turned on and
+ * Static class array used when the SecurityManager is turned on and
* <code>service</code> is invoked.
- */
+ */
private static Class<?>[] classTypeUsedInService = new Class[]{
ServletRequest.class,
ServletResponse.class};
/**
- * Static class array used when the SecurityManager is turned on and
+ * Static class array used when the SecurityManager is turned on and
* <code>doFilterEvent</code> is invoked.
*/
- private static Class<?>[] cometClassType =
+ private static Class<?>[] cometClassType =
new Class[]{ CometEvent.class, CometFilterChain.class};
-
+
/**
- * Static class array used when the SecurityManager is turned on and
+ * Static class array used when the SecurityManager is turned on and
* <code>event</code> is invoked.
- */
- private static Class<?>[] classTypeUsedInEvent =
+ */
+ private static Class<?>[] classTypeUsedInEvent =
new Class[] { CometEvent.class };
@@ -188,7 +188,7 @@ final class ApplicationFilterChain imple
java.security.AccessController.doPrivileged(
new java.security.PrivilegedExceptionAction<Void>() {
@Override
- public Void run()
+ public Void run()
throws ServletException, IOException {
internalDoFilter(req,res);
return null;
@@ -211,7 +211,7 @@ final class ApplicationFilterChain imple
}
}
- private void internalDoFilter(ServletRequest request,
+ private void internalDoFilter(ServletRequest request,
ServletResponse response)
throws IOException, ServletException {
@@ -223,7 +223,7 @@ final class ApplicationFilterChain imple
filter = filterConfig.getFilter();
support.fireInstanceEvent(InstanceEvent.BEFORE_FILTER_EVENT,
filter, request, response);
-
+
if (request.isAsyncSupported() && "false".equalsIgnoreCase(
filterConfig.getFilterDef().getAsyncSupported())) {
request.setAttribute(Globals.ASYNC_SUPPORTED_ATTR,
@@ -232,14 +232,14 @@ final class ApplicationFilterChain imple
if( Globals.IS_SECURITY_ENABLED ) {
final ServletRequest req = request;
final ServletResponse res = response;
- Principal principal =
+ Principal principal =
((HttpServletRequest) req).getUserPrincipal();
Object[] args = new Object[]{req, res, this};
SecurityUtil.doAsPrivilege
("doFilter", filter, classType, args, principal);
-
- } else {
+
+ } else {
filter.doFilter(request, response, this);
}
@@ -288,19 +288,19 @@ final class ApplicationFilterChain imple
// Use potentially wrapped request from this point
if ((request instanceof HttpServletRequest) &&
(response instanceof HttpServletResponse)) {
-
+
if( Globals.IS_SECURITY_ENABLED ) {
final ServletRequest req = request;
final ServletResponse res = response;
- Principal principal =
+ Principal principal =
((HttpServletRequest) req).getUserPrincipal();
Object[] args = new Object[]{req, res};
SecurityUtil.doAsPrivilege("service",
servlet,
- classTypeUsedInService,
+ classTypeUsedInService,
args,
- principal);
- } else {
+ principal);
+ } else {
servlet.service(request, response);
}
} else {
@@ -338,9 +338,9 @@ final class ApplicationFilterChain imple
/**
* Process the event, using the security manager if the option is enabled.
- *
+ *
* @param event the event to process
- *
+ *
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
@@ -354,7 +354,7 @@ final class ApplicationFilterChain imple
java.security.AccessController.doPrivileged(
new java.security.PrivilegedExceptionAction<Void>() {
@Override
- public Void run()
+ public Void run()
throws ServletException, IOException {
internalDoFilterEvent(ev);
return null;
@@ -377,29 +377,29 @@ final class ApplicationFilterChain imple
}
}
-
+
/**
* The last request passed to a servlet for servicing from the current
* thread.
- *
- * @return The last request to be serviced.
+ *
+ * @return The last request to be serviced.
*/
public static ServletRequest getLastServicedRequest() {
return lastServicedRequest.get();
}
-
+
/**
* The last response passed to a servlet for servicing from the current
* thread.
- *
- * @return The last response to be serviced.
+ *
+ * @return The last response to be serviced.
*/
public static ServletResponse getLastServicedResponse() {
return lastServicedResponse.get();
}
-
-
+
+
private void internalDoFilterEvent(CometEvent event)
throws IOException, ServletException {
@@ -417,14 +417,14 @@ final class ApplicationFilterChain imple
if( Globals.IS_SECURITY_ENABLED ) {
final CometEvent ev = event;
- Principal principal =
+ Principal principal =
ev.getHttpServletRequest().getUserPrincipal();
Object[] args = new Object[]{ev, this};
SecurityUtil.doAsPrivilege("doFilterEvent", filter,
cometClassType, args, principal);
- } else {
+ } else {
filter.doFilterEvent(event, this);
}
@@ -470,15 +470,15 @@ final class ApplicationFilterChain imple
*/
if( Globals.IS_SECURITY_ENABLED ) {
final CometEvent ev = event;
- Principal principal =
+ Principal principal =
ev.getHttpServletRequest().getUserPrincipal();
Object[] args = new Object[]{ ev };
SecurityUtil.doAsPrivilege("event",
servlet,
- classTypeUsedInEvent,
+ classTypeUsedInEvent,
args,
principal);
- } else {
+ } else {
((CometProcessor) servlet).event(event);
}
/*
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -179,7 +179,7 @@ public final class ApplicationFilterConf
@Override
public Enumeration<String> getInitParameterNames() {
Map<String,String> map = filterDef.getParameterMap();
-
+
if (map == null) {
return (new Enumerator<String>(new ArrayList<String>()));
}
@@ -250,9 +250,9 @@ public final class ApplicationFilterConf
// Identify the class loader we will be using
String filterClass = filterDef.getFilterClass();
this.filter = (Filter) getInstanceManager().newInstance(filterClass);
-
+
initFilter();
-
+
return (this.filter);
}
@@ -272,7 +272,7 @@ public final class ApplicationFilterConf
} else {
filter.init(this);
}
-
+
// Expose filter via JMX
registerJMX();
}
@@ -293,7 +293,7 @@ public final class ApplicationFilterConf
void release() {
unregisterJMX();
-
+
if (this.filter != null)
{
if (Globals.IS_SECURITY_ENABLED) {
@@ -386,7 +386,7 @@ public final class ApplicationFilterConf
instanceManager = new DefaultInstanceManager(null,
new HashMap<String, Map<String, String>>(),
context,
- getClass().getClassLoader());
+ getClass().getClassLoader());
}
}
return instanceManager;
@@ -426,7 +426,7 @@ public final class ApplicationFilterConf
getFilterClass(), getFilterName()), ex);
}
}
-
+
private void unregisterJMX() {
// unregister this component
if (oname != null) {
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.deploy.FilterMap;
/**
- * Factory for the creation and caching of Filters and creation
+ * Factory for the creation and caching of Filters and creation
* of Filter Chains.
*
* @author Greg Murray
@@ -44,9 +44,9 @@ public final class ApplicationFilterFact
// -------------------------------------------------------------- Constants
- public static final String DISPATCHER_TYPE_ATTR =
+ public static final String DISPATCHER_TYPE_ATTR =
Globals.DISPATCHER_TYPE_ATTR;
- public static final String DISPATCHER_REQUEST_PATH_ATTR =
+ public static final String DISPATCHER_REQUEST_PATH_ATTR =
Globals.DISPATCHER_REQUEST_PATH_ATTR;
private static ApplicationFilterFactory factory = null;
@@ -85,23 +85,23 @@ public final class ApplicationFilterFact
(ServletRequest request, Wrapper wrapper, Servlet servlet) {
// get the dispatcher type
- DispatcherType dispatcher = null;
+ DispatcherType dispatcher = null;
if (request.getAttribute(DISPATCHER_TYPE_ATTR) != null) {
dispatcher = (DispatcherType) request.getAttribute(DISPATCHER_TYPE_ATTR);
}
String requestPath = null;
Object attribute = request.getAttribute(DISPATCHER_REQUEST_PATH_ATTR);
-
+
if (attribute != null){
requestPath = attribute.toString();
}
-
+
// If there is no servlet to execute, return null
if (servlet == null)
return (null);
boolean comet = false;
-
+
// Create and initialize a filter chain object
ApplicationFilterChain filterChain = null;
if (request instanceof Request) {
@@ -159,7 +159,7 @@ public final class ApplicationFilterFact
try {
isCometFilter = filterConfig.getFilter() instanceof CometFilter;
} catch (Exception e) {
- // Note: The try catch is there because getFilter has a lot of
+ // Note: The try catch is there because getFilter has a lot of
// declared exceptions. However, the filter is allocated much
// earlier
}
@@ -189,7 +189,7 @@ public final class ApplicationFilterFact
try {
isCometFilter = filterConfig.getFilter() instanceof CometFilter;
} catch (Exception e) {
- // Note: The try catch is there because getFilter has a lot of
+ // Note: The try catch is there because getFilter has a lot of
// declared exceptions. However, the filter is allocated much
// earlier
}
@@ -224,24 +224,24 @@ public final class ApplicationFilterFact
// named dispatches
if (filterMap.getMatchAllUrlPatterns())
return (true);
-
+
if (requestPath == null)
return (false);
// Match on context relative request path
String[] testPaths = filterMap.getURLPatterns();
-
+
for (int i = 0; i < testPaths.length; i++) {
if (matchFiltersURL(testPaths[i], requestPath)) {
return (true);
}
}
-
+
// No match
return (false);
-
+
}
-
+
/**
* Return <code>true</code> if the context-relative request path
@@ -252,7 +252,7 @@ public final class ApplicationFilterFact
* @param requestPath Context-relative request path of this request
*/
private boolean matchFiltersURL(String testPath, String requestPath) {
-
+
if (testPath == null)
return (false);
@@ -264,7 +264,7 @@ public final class ApplicationFilterFact
if (testPath.equals("/*"))
return (true);
if (testPath.endsWith("/*")) {
- if (testPath.regionMatches(0, requestPath, 0,
+ if (testPath.regionMatches(0, requestPath, 0,
testPath.length() - 2)) {
if (requestPath.length() == (testPath.length() - 2)) {
return (true);
@@ -279,9 +279,9 @@ public final class ApplicationFilterFact
if (testPath.startsWith("*.")) {
int slash = requestPath.lastIndexOf('/');
int period = requestPath.lastIndexOf('.');
- if ((slash >= 0) && (period > slash)
+ if ((slash >= 0) && (period > slash)
&& (period != requestPath.length() - 1)
- && ((requestPath.length() - period)
+ && ((requestPath.length() - period)
== (testPath.length() - 1))) {
return (testPath.regionMatches(2, requestPath, period + 1,
testPath.length() - 2));
@@ -302,7 +302,7 @@ public final class ApplicationFilterFact
* @param filterMap Filter mapping being checked
* @param servletName Servlet name being checked
*/
- private boolean matchFiltersServlet(FilterMap filterMap,
+ private boolean matchFiltersServlet(FilterMap filterMap,
String servletName) {
if (servletName == null) {
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,15 +40,15 @@ public class ApplicationFilterRegistrati
*/
private static final StringManager sm =
StringManager.getManager(Constants.Package);
-
+
private FilterDef filterDef;
private Context context;
-
+
public ApplicationFilterRegistration(FilterDef filterDef,
Context context) {
this.filterDef = filterDef;
this.context = context;
-
+
}
@Override
@@ -57,20 +57,20 @@ public class ApplicationFilterRegistrati
String... servletNames) {
FilterMap filterMap = new FilterMap();
-
+
filterMap.setFilterName(filterDef.getFilterName());
-
+
if (dispatcherTypes != null) {
for (DispatcherType dispatcherType : dispatcherTypes) {
filterMap.setDispatcher(dispatcherType.name());
}
}
-
+
if (servletNames != null) {
for (String servletName : servletNames) {
filterMap.addServletName(servletName);
}
-
+
if (isMatchAfter) {
context.addFilterMapBefore(filterMap);
} else {
@@ -94,12 +94,12 @@ public class ApplicationFilterRegistrati
filterMap.setDispatcher(dispatcherType.name());
}
}
-
+
if (urlPatterns != null) {
for (String urlPattern : urlPatterns) {
filterMap.addURLPattern(urlPattern);
}
-
+
if (isMatchAfter) {
context.addFilterMapBefore(filterMap);
} else {
@@ -107,15 +107,15 @@ public class ApplicationFilterRegistrati
}
}
// else error?
-
+
}
@Override
public Collection<String> getServletNameMappings() {
Collection<String> result = new HashSet<String>();
-
+
FilterMap[] filterMaps = context.findFilterMaps();
-
+
for (FilterMap filterMap : filterMaps) {
if (filterMap.getFilterName().equals(filterDef.getFilterName())) {
for (String servletName : filterMap.getServletNames()) {
@@ -129,9 +129,9 @@ public class ApplicationFilterRegistrati
@Override
public Collection<String> getUrlPatternMappings() {
Collection<String> result = new HashSet<String>();
-
+
FilterMap[] filterMaps = context.findFilterMaps();
-
+
for (FilterMap filterMap : filterMaps) {
if (filterMap.getFilterName().equals(filterDef.getFilterName())) {
for (String urlPattern : filterMap.getURLPatterns()) {
@@ -175,7 +175,7 @@ public class ApplicationFilterRegistrati
if (getInitParameter(name) != null) {
return false;
}
-
+
filterDef.addInitParameter(name, value);
return true;
@@ -183,9 +183,9 @@ public class ApplicationFilterRegistrati
@Override
public Set<String> setInitParameters(Map<String, String> initParameters) {
-
+
Set<String> conflicts = new HashSet<String>();
-
+
for (Map.Entry<String, String> entry : initParameters.entrySet()) {
if (entry.getKey() == null || entry.getValue() == null) {
throw new IllegalArgumentException(sm.getString(
@@ -202,7 +202,7 @@ public class ApplicationFilterRegistrati
for (Map.Entry<String, String> entry : initParameters.entrySet()) {
setInitParameter(entry.getKey(), entry.getValue());
}
-
+
return conflicts;
}
@@ -210,5 +210,5 @@ public class ApplicationFilterRegistrati
public void setAsyncSupported(boolean asyncSupported) {
filterDef.setAsyncSupported(Boolean.valueOf(asyncSupported).toString());
}
-
+
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -73,9 +73,9 @@ class ApplicationHttpRequest extends Htt
RequestDispatcher.INCLUDE_SERVLET_PATH,
RequestDispatcher.INCLUDE_PATH_INFO,
RequestDispatcher.INCLUDE_QUERY_STRING,
- RequestDispatcher.FORWARD_REQUEST_URI,
+ RequestDispatcher.FORWARD_REQUEST_URI,
RequestDispatcher.FORWARD_CONTEXT_PATH,
- RequestDispatcher.FORWARD_SERVLET_PATH,
+ RequestDispatcher.FORWARD_SERVLET_PATH,
RequestDispatcher.FORWARD_PATH_INFO,
RequestDispatcher.FORWARD_QUERY_STRING };
@@ -186,7 +186,7 @@ class ApplicationHttpRequest extends Htt
* Special attributes.
*/
protected Object[] specialAttributes = new Object[specials.length];
-
+
// ------------------------------------------------- ServletRequest Methods
@@ -205,7 +205,7 @@ class ApplicationHttpRequest extends Htt
if ( requestDispatcherPath != null ){
return requestDispatcherPath.toString();
} else {
- return null;
+ return null;
}
}
@@ -213,10 +213,10 @@ class ApplicationHttpRequest extends Htt
if (pos == -1) {
return getRequest().getAttribute(name);
} else {
- if ((specialAttributes[pos] == null)
+ if ((specialAttributes[pos] == null)
&& (specialAttributes[5] == null) && (pos >= 5)) {
// If it's a forward special attribute, and null, it means this
- // is an include, so we check the wrapped request since
+ // is an include, so we check the wrapped request since
// the request could have been forwarded before the include
return getRequest().getAttribute(name);
} else {
@@ -296,7 +296,7 @@ class ApplicationHttpRequest extends Htt
return (context.getServletContext().getRequestDispatcher(path));
// Convert a request-relative path to a context-relative one
- String servletPath =
+ String servletPath =
(String) getAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH);
if (servletPath == null)
servletPath = getServletPath();
@@ -323,10 +323,10 @@ class ApplicationHttpRequest extends Htt
}
-
+
/**
* Override the getDispatcherType() method of the wrapped request.
- *
+ *
*/
@Override
public DispatcherType getDispatcherType() {
@@ -521,7 +521,7 @@ class ApplicationHttpRequest extends Htt
public HttpSession getSession(boolean create) {
if (crossContext) {
-
+
// There cannot be a session if no context has been assigned yet
if (context == null)
return (null);
@@ -534,7 +534,7 @@ class ApplicationHttpRequest extends Htt
HttpSession other = super.getSession(false);
if (create && (other == null)) {
// First create a session in the first context: the problem is
- // that the top level request is the only one which can
+ // that the top level request is the only one which can
// create the cookie safely
other = super.getSession(true);
}
@@ -550,7 +550,7 @@ class ApplicationHttpRequest extends Htt
// Ignore
}
if (localSession == null && create) {
- localSession =
+ localSession =
context.getManager().createSession(other.getId());
}
if (localSession != null) {
@@ -629,7 +629,7 @@ class ApplicationHttpRequest extends Htt
if (orig == null)
return (new HashMap<String, String[]>());
HashMap<String, String[]> dest = new HashMap<String, String[]>();
-
+
for (Map.Entry<String, String[]> entry : orig.entrySet()) {
dest.put(entry.getKey(), entry.getValue());
}
@@ -686,7 +686,7 @@ class ApplicationHttpRequest extends Htt
// Initialize the attributes for this request
dispatcherType = (DispatcherType)request.getAttribute(Globals.DISPATCHER_TYPE_ATTR);
- requestDispatcherPath =
+ requestDispatcherPath =
request.getAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR);
// Initialize the path elements for this request
@@ -774,7 +774,7 @@ class ApplicationHttpRequest extends Htt
/**
* Get a special attribute.
*
- * @return the special attribute pos, or -1 if it is not a special
+ * @return the special attribute pos, or -1 if it is not a special
* attribute
*/
protected int getSpecial(String name) {
@@ -789,7 +789,7 @@ class ApplicationHttpRequest extends Htt
/**
* Set a special attribute.
- *
+ *
* @return true if the attribute was a special attribute, false otherwise
*/
protected boolean setSpecial(String name, Object value) {
@@ -805,7 +805,7 @@ class ApplicationHttpRequest extends Htt
/**
* Remove a special attribute.
- *
+ *
* @return true if the attribute was a special attribute, false otherwise
*/
protected boolean removeSpecial(String name) {
@@ -918,7 +918,7 @@ class ApplicationHttpRequest extends Htt
@Override
public boolean hasMoreElements() {
- return ((pos != last) || (next != null)
+ return ((pos != last) || (next != null)
|| ((next = findNext()) != null));
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationJspConfigDescriptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationJspConfigDescriptor.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationJspConfigDescriptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationJspConfigDescriptor.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,142 +30,142 @@ public class ApplicationJspPropertyGroup
JspPropertyGroup jspPropertyGroup;
-
+
public ApplicationJspPropertyGroupDescriptor(
JspPropertyGroup jspPropertyGroup) {
this.jspPropertyGroup = jspPropertyGroup;
}
-
+
@Override
public String getBuffer() {
String result = null;
-
+
if (jspPropertyGroup.getBuffer() != null) {
result = jspPropertyGroup.getBuffer().toString();
}
-
+
return result;
}
-
+
@Override
public String getDefaultContentType() {
String result = null;
-
+
if (jspPropertyGroup.getDefaultContentType() != null) {
result = jspPropertyGroup.getDefaultContentType().toString();
}
-
+
return result;
}
-
+
@Override
public String getDeferredSyntaxAllowedAsLiteral() {
String result = null;
-
+
if (jspPropertyGroup.getDeferredSyntax() != null) {
result = jspPropertyGroup.getDeferredSyntax().toString();
}
-
+
return result;
}
-
+
@Override
public String getElIgnored() {
String result = null;
-
+
if (jspPropertyGroup.getElIgnored() != null) {
result = jspPropertyGroup.getElIgnored().toString();
}
-
+
return result;
}
-
+
@Override
public String getErrorOnUndeclaredNamespace() {
String result = null;
-
+
if (jspPropertyGroup.getErrorOnUndeclaredNamespace() != null) {
result =
jspPropertyGroup.getErrorOnUndeclaredNamespace().toString();
}
-
+
return result;
}
-
+
@Override
public Collection<String> getIncludeCodas() {
return jspPropertyGroup.getIncludeCodas();
}
-
+
@Override
public Collection<String> getIncludePreludes() {
return jspPropertyGroup.getIncludePreludes();
}
-
+
@Override
public String getIsXml() {
String result = null;
-
+
if (jspPropertyGroup.getIsXml() != null) {
result = jspPropertyGroup.getIsXml().toString();
}
-
+
return result;
}
-
+
@Override
public String getPageEncoding() {
String result = null;
-
+
if (jspPropertyGroup.getPageEncoding() != null) {
result = jspPropertyGroup.getPageEncoding().toString();
}
-
+
return result;
}
-
+
@Override
public String getScriptingInvalid() {
String result = null;
-
+
if (jspPropertyGroup.getScriptingInvalid() != null) {
result = jspPropertyGroup.getScriptingInvalid().toString();
}
-
+
return result;
}
-
+
@Override
public String getTrimDirectiveWhitespaces() {
String result = null;
-
+
if (jspPropertyGroup.getTrimWhitespace() != null) {
result = jspPropertyGroup.getTrimWhitespace().toString();
}
-
+
return result;
}
-
+
@Override
public Collection<String> getUrlPatterns() {
Collection<String> result = new HashSet<String>();
-
+
if (jspPropertyGroup.getUrlPattern() != null) {
result.add(jspPropertyGroup.getUrlPattern());
}
-
+
return result;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -60,9 +60,9 @@ class ApplicationRequest extends Servlet
RequestDispatcher.INCLUDE_SERVLET_PATH,
RequestDispatcher.INCLUDE_PATH_INFO,
RequestDispatcher.INCLUDE_QUERY_STRING,
- RequestDispatcher.FORWARD_REQUEST_URI,
+ RequestDispatcher.FORWARD_REQUEST_URI,
RequestDispatcher.FORWARD_CONTEXT_PATH,
- RequestDispatcher.FORWARD_SERVLET_PATH,
+ RequestDispatcher.FORWARD_SERVLET_PATH,
RequestDispatcher.FORWARD_PATH_INFO,
RequestDispatcher.FORWARD_QUERY_STRING };
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationResponse.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java?rev=1187787&r1=1187786&r2=1187787&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java Sat Oct 22 21:08:51 2011
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,15 +41,15 @@ public class ApplicationServletRegistrat
*/
private static final StringManager sm =
StringManager.getManager(Constants.Package);
-
+
private Wrapper wrapper;
private Context context;
-
+
public ApplicationServletRegistration(Wrapper wrapper,
Context context) {
this.wrapper = wrapper;
this.context = context;
-
+
}
@Override
@@ -65,9 +65,9 @@ public class ApplicationServletRegistrat
@Override
public Map<String, String> getInitParameters() {
ParameterMap<String,String> result = new ParameterMap<String,String>();
-
+
String[] parameterNames = wrapper.findInitParameters();
-
+
for (String parameterName : parameterNames) {
result.put(parameterName, wrapper.findInitParameter(parameterName));
}
@@ -91,7 +91,7 @@ public class ApplicationServletRegistrat
if (getInitParameter(name) != null) {
return false;
}
-
+
wrapper.addInitParameter(name, value);
return true;
@@ -99,9 +99,9 @@ public class ApplicationServletRegistrat
@Override
public Set<String> setInitParameters(Map<String, String> initParameters) {
-
+
Set<String> conflicts = new HashSet<String>();
-
+
for (Map.Entry<String, String> entry : initParameters.entrySet()) {
if (entry.getKey() == null || entry.getValue() == null) {
throw new IllegalArgumentException(sm.getString(
@@ -151,7 +151,7 @@ public class ApplicationServletRegistrat
"applicationServletRegistration.setServletSecurity.iae",
getName(), context.getName()));
}
-
+
if (!context.getState().equals(LifecycleState.STARTING_PREP)) {
throw new IllegalStateException(sm.getString(
"applicationServletRegistration.setServletSecurity.ise",
@@ -167,9 +167,9 @@ public class ApplicationServletRegistrat
if (urlPatterns == null) {
return Collections.emptySet();
}
-
+
Set<String> conflicts = new HashSet<String>();
-
+
for (String urlPattern : urlPatterns) {
String wrapperName = context.findServletMapping(urlPattern);
if (wrapperName != null) {
@@ -187,7 +187,7 @@ public class ApplicationServletRegistrat
if (!conflicts.isEmpty()) {
return conflicts;
}
-
+
for (String urlPattern : urlPatterns) {
context.addServletMapping(urlPattern, wrapper.getName());
}
@@ -199,7 +199,7 @@ public class ApplicationServletRegistrat
Set<String> result = new HashSet<String>();
String servletName = wrapper.getName();
-
+
String[] urlPatterns = context.findServletMappings();
for (String urlPattern : urlPatterns) {
String name = context.findServletMapping(urlPattern);
@@ -214,5 +214,5 @@ public class ApplicationServletRegistrat
public String getRunAsRole() {
return wrapper.getRunAs();
}
-
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org