Author: markt
Date: Wed Aug 7 09:18:31 2013
New Revision: 1511219
URL: http://svn.apache.org/r1511219
Log:
No functional change. Fix long lines.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1511212
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=1511219&r1=1511218&r2=1511219&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Wed Aug 7 09:18:31 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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
