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 2013/08/07 10:47:35 UTC
svn commit: r1511212 -
/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Author: markt
Date: Wed Aug 7 08:47:35 2013
New Revision: 1511212
URL: http://svn.apache.org/r1511212
Log:
No functional change.
Move some longer lines around prior to some functional changes.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
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=1511212&r1=1511211&r2=1511212&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java Wed Aug 7 08:47:35 2013
@@ -448,8 +448,9 @@ public class ApplicationContextFacade im
public FilterRegistration.Dynamic addFilter(String filterName,
Filter filter) {
if (SecurityUtil.isPackageProtectionEnabled()) {
- return (FilterRegistration.Dynamic) doPrivileged(
- "addFilter", new Class[]{String.class, Filter.class}, new Object[]{filterName, filter});
+ return (FilterRegistration.Dynamic) doPrivileged("addFilter",
+ new Class[]{String.class, Filter.class},
+ new Object[]{filterName, filter});
} else {
return context.addFilter(filterName, filter);
}
@@ -460,8 +461,8 @@ public class ApplicationContextFacade im
public FilterRegistration.Dynamic addFilter(String filterName,
Class<? extends Filter> filterClass) {
if (SecurityUtil.isPackageProtectionEnabled()) {
- return (FilterRegistration.Dynamic) doPrivileged(
- "addFilter", new Object[]{filterName, filterClass.getName()});
+ return (FilterRegistration.Dynamic) doPrivileged("addFilter",
+ new Object[]{filterName, filterClass.getName()});
} else {
return context.addFilter(filterName, filterClass);
}
@@ -515,8 +516,9 @@ public class ApplicationContextFacade im
public ServletRegistration.Dynamic addServlet(String servletName,
Servlet servlet) {
if (SecurityUtil.isPackageProtectionEnabled()) {
- return (ServletRegistration.Dynamic) doPrivileged(
- "addServlet", new Class[]{String.class, Servlet.class}, new Object[]{servletName, servlet});
+ return (ServletRegistration.Dynamic) doPrivileged("addServlet",
+ new Class[]{String.class, Servlet.class},
+ new Object[]{servletName, servlet});
} else {
return context.addServlet(servletName, servlet);
}
@@ -527,8 +529,8 @@ public class ApplicationContextFacade im
public ServletRegistration.Dynamic addServlet(String servletName,
Class<? extends Servlet> servletClass) {
if (SecurityUtil.isPackageProtectionEnabled()) {
- return (ServletRegistration.Dynamic) doPrivileged(
- "addServlet", new Object[]{servletName, servletClass.getName()});
+ return (ServletRegistration.Dynamic) doPrivileged("addServlet",
+ new Object[]{servletName, servletClass.getName()});
} else {
return context.addServlet(servletName, servletClass);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org