This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b8e6d382c61c9ea250b082bbe70d4f85ef804928
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 14 11:59:33 2023 +0100
Code clean-up - formatting. No functional change.
---
.../apache/catalina/core/ApplicationContext.java | 20 ++---
.../catalina/core/ApplicationContextFacade.java | 6 +-
.../catalina/core/ApplicationDispatcher.java | 8 +-
.../catalina/core/ApplicationFilterConfig.java | 6 +-
.../catalina/core/ApplicationFilterFactory.java | 8 +-
.../core/ApplicationFilterRegistration.java | 10 +--
.../catalina/core/ApplicationHttpRequest.java | 20 ++---
java/org/apache/catalina/core/ApplicationPart.java | 2 +-
.../catalina/core/ApplicationPushBuilder.java | 8 +-
.../apache/catalina/core/ApplicationRequest.java | 16 ++--
.../core/ApplicationServletRegistration.java | 10 +--
.../core/ApplicationSessionCookieConfig.java | 6 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 4 +-
java/org/apache/catalina/core/ContainerBase.java | 2 +-
.../catalina/core/ContextNamingInfoListener.java | 13 ++--
.../catalina/core/DefaultInstanceManager.java | 38 +++++-----
.../apache/catalina/core/FrameworkListener.java | 2 +-
.../core/JreMemoryLeakPreventionListener.java | 5 +-
.../catalina/core/NamingContextListener.java | 12 +--
java/org/apache/catalina/core/StandardContext.java | 86 +++++++++++-----------
java/org/apache/catalina/core/StandardHost.java | 8 +-
java/org/apache/catalina/core/StandardServer.java | 9 +--
java/org/apache/catalina/core/StandardWrapper.java | 4 +-
23 files changed, 152 insertions(+), 151 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index a04a7706b0..682ccc123b 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -113,13 +113,13 @@ public class ApplicationContext implements ServletContext
{
/**
* The context attributes for this context.
*/
- protected Map<String, Object> attributes = new ConcurrentHashMap<>();
+ protected Map<String,Object> attributes = new ConcurrentHashMap<>();
/**
* List of read only attributes for this context.
*/
- private final Map<String, String> readOnlyAttributes = new
ConcurrentHashMap<>();
+ private final Map<String,String> readOnlyAttributes = new
ConcurrentHashMap<>();
/**
@@ -143,7 +143,7 @@ public class ApplicationContext implements ServletContext {
/**
* The merged context initialization parameters for this Context.
*/
- private final Map<String, String> parameters = new ConcurrentHashMap<>();
+ private final Map<String,String> parameters = new ConcurrentHashMap<>();
/**
@@ -799,7 +799,7 @@ public class ApplicationContext implements ServletContext {
}
String jspServletClassName = null;
- Map<String, String> jspFileInitParams = new HashMap<>();
+ Map<String,String> jspFileInitParams = new HashMap<>();
Wrapper jspServlet = (Wrapper) context.findChild("jsp");
@@ -826,7 +826,7 @@ public class ApplicationContext implements ServletContext {
private ServletRegistration.Dynamic addServlet(String servletName, String
servletClass, Servlet servlet,
- Map<String, String> initParams) throws IllegalStateException {
+ Map<String,String> initParams) throws IllegalStateException {
if (servletName == null || servletName.equals("")) {
throw new
IllegalArgumentException(sm.getString("applicationContext.invalidServletName",
servletName));
@@ -869,7 +869,7 @@ public class ApplicationContext implements ServletContext {
}
if (initParams != null) {
- for (Map.Entry<String, String> initParam : initParams.entrySet()) {
+ for (Map.Entry<String,String> initParam : initParams.entrySet()) {
wrapper.addInitParameter(initParam.getKey(),
initParam.getValue());
}
}
@@ -1121,8 +1121,8 @@ public class ApplicationContext implements ServletContext
{
@Override
- public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
- Map<String, ApplicationFilterRegistration> result = new HashMap<>();
+ public Map<String,? extends FilterRegistration> getFilterRegistrations() {
+ Map<String,ApplicationFilterRegistration> result = new HashMap<>();
FilterDef[] filterDefs = context.findFilterDefs();
for (FilterDef filterDef : filterDefs) {
@@ -1140,8 +1140,8 @@ public class ApplicationContext implements ServletContext
{
@Override
- public Map<String, ? extends ServletRegistration>
getServletRegistrations() {
- Map<String, ApplicationServletRegistration> result = new HashMap<>();
+ public Map<String,? extends ServletRegistration> getServletRegistrations()
{
+ Map<String,ApplicationServletRegistration> result = new HashMap<>();
Container[] wrappers = context.findChildren();
for (Container wrapper : wrappers) {
diff --git a/java/org/apache/catalina/core/ApplicationContextFacade.java
b/java/org/apache/catalina/core/ApplicationContextFacade.java
index 260eaa91fd..24678d8782 100644
--- a/java/org/apache/catalina/core/ApplicationContextFacade.java
+++ b/java/org/apache/catalina/core/ApplicationContextFacade.java
@@ -50,7 +50,7 @@ public class ApplicationContextFacade implements
ServletContext {
/**
* Cache Class object used for reflection.
*/
- private final Map<String, Class<?>[]> classCache;
+ private final Map<String,Class<?>[]> classCache;
// ----------------------------------------------------------- Constructors
@@ -387,7 +387,7 @@ public class ApplicationContextFacade implements
ServletContext {
@Override
- public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+ public Map<String,? extends FilterRegistration> getFilterRegistrations() {
return context.getFilterRegistrations();
}
@@ -399,7 +399,7 @@ public class ApplicationContextFacade implements
ServletContext {
@Override
- public Map<String, ? extends ServletRegistration>
getServletRegistrations() {
+ public Map<String,? extends ServletRegistration> getServletRegistrations()
{
return context.getServletRegistrations();
}
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 60976a5587..9052ca8587 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -122,8 +122,8 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
* @param mapping The mapping for this resource (if any)
* @param name Servlet name (if a named dispatcher was created)
else <code>null</code>
*/
- ApplicationDispatcher(Wrapper wrapper, String requestURI, String
servletPath, String pathInfo,
- String queryString, HttpServletMapping mapping, String name) {
+ ApplicationDispatcher(Wrapper wrapper, String requestURI, String
servletPath, String pathInfo, String queryString,
+ HttpServletMapping mapping, String name) {
super();
@@ -519,8 +519,8 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
wrapper.getLogger().error(sm.getString("applicationDispatcher.allocateException",
wrapper.getName()), e);
- servletException = new ServletException(
- sm.getString("applicationDispatcher.allocateException",
wrapper.getName()), e);
+ servletException =
+ new
ServletException(sm.getString("applicationDispatcher.allocateException",
wrapper.getName()), e);
servlet = null;
}
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index acf10b0d2a..a581816641 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -153,7 +153,7 @@ public final class ApplicationFilterConfig implements
FilterConfig, Serializable
@Override
public String getInitParameter(String name) {
- Map<String, String> map = filterDef.getParameterMap();
+ Map<String,String> map = filterDef.getParameterMap();
if (map == null) {
return null;
}
@@ -168,7 +168,7 @@ public final class ApplicationFilterConfig implements
FilterConfig, Serializable
*/
@Override
public Enumeration<String> getInitParameterNames() {
- Map<String, String> map = filterDef.getParameterMap();
+ Map<String,String> map = filterDef.getParameterMap();
if (map == null) {
return Collections.enumeration(emptyString);
@@ -205,7 +205,7 @@ public final class ApplicationFilterConfig implements
FilterConfig, Serializable
// --------------------------------------------------------- Public Methods
- public Map<String, String> getFilterInitParameterMap() {
+ public Map<String,String> getFilterInitParameterMap() {
return Collections.unmodifiableMap(filterDef.getParameterMap());
}
diff --git a/java/org/apache/catalina/core/ApplicationFilterFactory.java
b/java/org/apache/catalina/core/ApplicationFilterFactory.java
index 8774fa70af..610abd3364 100644
--- a/java/org/apache/catalina/core/ApplicationFilterFactory.java
+++ b/java/org/apache/catalina/core/ApplicationFilterFactory.java
@@ -100,8 +100,8 @@ public final class ApplicationFilterFactory {
if (!matchFiltersURL(filterMap, requestPath)) {
continue;
}
- ApplicationFilterConfig filterConfig = (ApplicationFilterConfig)
context
- .findFilterConfig(filterMap.getFilterName());
+ ApplicationFilterConfig filterConfig =
+ (ApplicationFilterConfig)
context.findFilterConfig(filterMap.getFilterName());
if (filterConfig == null) {
// FIXME - log configuration problem
continue;
@@ -117,8 +117,8 @@ public final class ApplicationFilterFactory {
if (!matchFiltersServlet(filterMap, servletName)) {
continue;
}
- ApplicationFilterConfig filterConfig = (ApplicationFilterConfig)
context
- .findFilterConfig(filterMap.getFilterName());
+ ApplicationFilterConfig filterConfig =
+ (ApplicationFilterConfig)
context.findFilterConfig(filterMap.getFilterName());
if (filterConfig == null) {
// FIXME - log configuration problem
continue;
diff --git a/java/org/apache/catalina/core/ApplicationFilterRegistration.java
b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
index 98839f0f2f..c14ce0314f 100644
--- a/java/org/apache/catalina/core/ApplicationFilterRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationFilterRegistration.java
@@ -145,8 +145,8 @@ public class ApplicationFilterRegistration implements
FilterRegistration.Dynamic
}
@Override
- public Map<String, String> getInitParameters() {
- ParameterMap<String, String> result = new ParameterMap<>();
+ public Map<String,String> getInitParameters() {
+ ParameterMap<String,String> result = new ParameterMap<>();
result.putAll(filterDef.getParameterMap());
result.setLocked(true);
return result;
@@ -173,11 +173,11 @@ public class ApplicationFilterRegistration implements
FilterRegistration.Dynamic
}
@Override
- public Set<String> setInitParameters(Map<String, String> initParameters) {
+ public Set<String> setInitParameters(Map<String,String> initParameters) {
Set<String> conflicts = new HashSet<>();
- for (Map.Entry<String, String> entry : initParameters.entrySet()) {
+ for (Map.Entry<String,String> entry : initParameters.entrySet()) {
if (entry.getKey() == null || entry.getValue() == null) {
throw new IllegalArgumentException(
sm.getString("applicationFilterRegistration.nullInitParams", entry.getKey(),
entry.getValue()));
@@ -189,7 +189,7 @@ public class ApplicationFilterRegistration implements
FilterRegistration.Dynamic
// Have to add in a separate loop since spec requires no updates at all
// if there is an issue
- for (Map.Entry<String, String> entry : initParameters.entrySet()) {
+ for (Map.Entry<String,String> entry : initParameters.entrySet()) {
setInitParameter(entry.getKey(), entry.getValue());
}
diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java
b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index 46118f0161..1b93479d32 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -74,13 +74,13 @@ class ApplicationHttpRequest extends
HttpServletRequestWrapper {
/**
* The set of attribute names that are special for request dispatchers.
*/
- protected static final String specials[] = {
RequestDispatcher.INCLUDE_REQUEST_URI,
- RequestDispatcher.INCLUDE_CONTEXT_PATH,
RequestDispatcher.INCLUDE_SERVLET_PATH,
- RequestDispatcher.INCLUDE_PATH_INFO,
RequestDispatcher.INCLUDE_QUERY_STRING,
- RequestDispatcher.INCLUDE_MAPPING,
RequestDispatcher.FORWARD_REQUEST_URI,
- RequestDispatcher.FORWARD_CONTEXT_PATH,
RequestDispatcher.FORWARD_SERVLET_PATH,
- RequestDispatcher.FORWARD_PATH_INFO,
RequestDispatcher.FORWARD_QUERY_STRING,
- RequestDispatcher.FORWARD_MAPPING };
+ protected static final String specials[] =
+ { RequestDispatcher.INCLUDE_REQUEST_URI,
RequestDispatcher.INCLUDE_CONTEXT_PATH,
+ RequestDispatcher.INCLUDE_SERVLET_PATH,
RequestDispatcher.INCLUDE_PATH_INFO,
+ RequestDispatcher.INCLUDE_QUERY_STRING,
RequestDispatcher.INCLUDE_MAPPING,
+ RequestDispatcher.FORWARD_REQUEST_URI,
RequestDispatcher.FORWARD_CONTEXT_PATH,
+ RequestDispatcher.FORWARD_SERVLET_PATH,
RequestDispatcher.FORWARD_PATH_INFO,
+ RequestDispatcher.FORWARD_QUERY_STRING,
RequestDispatcher.FORWARD_MAPPING };
private static final int SPECIALS_FIRST_FORWARD_INDEX = 6;
@@ -135,7 +135,7 @@ class ApplicationHttpRequest extends
HttpServletRequestWrapper {
/**
* The request parameters for this request. This is initialized from the
wrapped request.
*/
- protected Map<String, String[]> parameters = null;
+ protected Map<String,String[]> parameters = null;
/**
@@ -400,7 +400,7 @@ class ApplicationHttpRequest extends
HttpServletRequestWrapper {
* Override the <code>getParameterMap()</code> method of the wrapped
request.
*/
@Override
- public Map<String, String[]> getParameterMap() {
+ public Map<String,String[]> getParameterMap() {
parseParameters();
return parameters;
}
@@ -719,7 +719,7 @@ class ApplicationHttpRequest extends
HttpServletRequestWrapper {
parameters = new ParameterMap<>();
parameters.putAll(getRequest().getParameterMap());
mergeParameters();
- ((ParameterMap<String, String[]>) parameters).setLocked(true);
+ ((ParameterMap<String,String[]>) parameters).setLocked(true);
parsedParams = true;
}
diff --git a/java/org/apache/catalina/core/ApplicationPart.java
b/java/org/apache/catalina/core/ApplicationPart.java
index c5aaf264bd..62720374fe 100644
--- a/java/org/apache/catalina/core/ApplicationPart.java
+++ b/java/org/apache/catalina/core/ApplicationPart.java
@@ -137,7 +137,7 @@ public class ApplicationPart implements Part {
ParameterParser paramParser = new ParameterParser();
paramParser.setLowerCaseNames(true);
// Parameter parser can handle null input
- Map<String, String> params = paramParser.parse(cd, ';');
+ Map<String,String> params = paramParser.parse(cd, ';');
if (params.containsKey("filename")) {
fileName = params.get("filename");
// The parser will remove surrounding '"' but will not
diff --git a/java/org/apache/catalina/core/ApplicationPushBuilder.java
b/java/org/apache/catalina/core/ApplicationPushBuilder.java
index b7a671dc9a..90250326ac 100644
--- a/java/org/apache/catalina/core/ApplicationPushBuilder.java
+++ b/java/org/apache/catalina/core/ApplicationPushBuilder.java
@@ -67,7 +67,7 @@ public class ApplicationPushBuilder implements PushBuilder {
private final boolean addSessionCookie;
private final boolean addSessionPathParameter;
- private final Map<String, List<String>> headers = new
CaseInsensitiveKeyMap<>();
+ private final Map<String,List<String>> headers = new
CaseInsensitiveKeyMap<>();
private final List<Cookie> cookies = new ArrayList<>();
private String method = "GET";
private String path;
@@ -128,8 +128,8 @@ public class ApplicationPushBuilder implements PushBuilder {
sessionId = request.getRequestedSessionId();
}
if (!request.isRequestedSessionIdFromCookie() &&
!request.isRequestedSessionIdFromURL() && sessionId != null) {
- Set<SessionTrackingMode> sessionTrackingModes =
request.getServletContext()
- .getEffectiveSessionTrackingModes();
+ Set<SessionTrackingMode> sessionTrackingModes =
+
request.getServletContext().getEffectiveSessionTrackingModes();
addSessionCookie =
sessionTrackingModes.contains(SessionTrackingMode.COOKIE);
addSessionPathParameter =
sessionTrackingModes.contains(SessionTrackingMode.URL);
} else {
@@ -300,7 +300,7 @@ public class ApplicationPushBuilder implements PushBuilder {
pushTarget.scheme().setString(baseRequest.getScheme());
// Copy headers
- for (Map.Entry<String, List<String>> header : headers.entrySet()) {
+ for (Map.Entry<String,List<String>> header : headers.entrySet()) {
for (String value : header.getValue()) {
pushTarget.getMimeHeaders().addValue(header.getKey()).setString(value);
}
diff --git a/java/org/apache/catalina/core/ApplicationRequest.java
b/java/org/apache/catalina/core/ApplicationRequest.java
index 050aa92145..d3f247267a 100644
--- a/java/org/apache/catalina/core/ApplicationRequest.java
+++ b/java/org/apache/catalina/core/ApplicationRequest.java
@@ -47,13 +47,13 @@ class ApplicationRequest extends ServletRequestWrapper {
/**
* The set of attribute names that are special for request dispatchers.
*/
- protected static final String specials[] = {
RequestDispatcher.INCLUDE_REQUEST_URI,
- RequestDispatcher.INCLUDE_CONTEXT_PATH,
RequestDispatcher.INCLUDE_SERVLET_PATH,
- RequestDispatcher.INCLUDE_PATH_INFO,
RequestDispatcher.INCLUDE_QUERY_STRING,
- RequestDispatcher.INCLUDE_MAPPING,
RequestDispatcher.FORWARD_REQUEST_URI,
- RequestDispatcher.FORWARD_CONTEXT_PATH,
RequestDispatcher.FORWARD_SERVLET_PATH,
- RequestDispatcher.FORWARD_PATH_INFO,
RequestDispatcher.FORWARD_QUERY_STRING,
- RequestDispatcher.FORWARD_MAPPING };
+ protected static final String specials[] =
+ { RequestDispatcher.INCLUDE_REQUEST_URI,
RequestDispatcher.INCLUDE_CONTEXT_PATH,
+ RequestDispatcher.INCLUDE_SERVLET_PATH,
RequestDispatcher.INCLUDE_PATH_INFO,
+ RequestDispatcher.INCLUDE_QUERY_STRING,
RequestDispatcher.INCLUDE_MAPPING,
+ RequestDispatcher.FORWARD_REQUEST_URI,
RequestDispatcher.FORWARD_CONTEXT_PATH,
+ RequestDispatcher.FORWARD_SERVLET_PATH,
RequestDispatcher.FORWARD_PATH_INFO,
+ RequestDispatcher.FORWARD_QUERY_STRING,
RequestDispatcher.FORWARD_MAPPING };
// ----------------------------------------------------------- Constructors
@@ -78,7 +78,7 @@ class ApplicationRequest extends ServletRequestWrapper {
/**
* The request attributes for this request. This is initialized from the
wrapped request, but updates are allowed.
*/
- protected final HashMap<String, Object> attributes = new HashMap<>();
+ protected final HashMap<String,Object> attributes = new HashMap<>();
// ------------------------------------------------- ServletRequest Methods
diff --git a/java/org/apache/catalina/core/ApplicationServletRegistration.java
b/java/org/apache/catalina/core/ApplicationServletRegistration.java
index 808e16bf52..71adec81ac 100644
--- a/java/org/apache/catalina/core/ApplicationServletRegistration.java
+++ b/java/org/apache/catalina/core/ApplicationServletRegistration.java
@@ -62,8 +62,8 @@ public class ApplicationServletRegistration implements
ServletRegistration.Dynam
}
@Override
- public Map<String, String> getInitParameters() {
- ParameterMap<String, String> result = new ParameterMap<>();
+ public Map<String,String> getInitParameters() {
+ ParameterMap<String,String> result = new ParameterMap<>();
String[] parameterNames = wrapper.findInitParameters();
@@ -96,11 +96,11 @@ public class ApplicationServletRegistration implements
ServletRegistration.Dynam
}
@Override
- public Set<String> setInitParameters(Map<String, String> initParameters) {
+ public Set<String> setInitParameters(Map<String,String> initParameters) {
Set<String> conflicts = new HashSet<>();
- for (Map.Entry<String, String> entry : initParameters.entrySet()) {
+ for (Map.Entry<String,String> entry : initParameters.entrySet()) {
if (entry.getKey() == null || entry.getValue() == null) {
throw new IllegalArgumentException(
sm.getString("applicationFilterRegistration.nullInitParams", entry.getKey(),
entry.getValue()));
@@ -113,7 +113,7 @@ public class ApplicationServletRegistration implements
ServletRegistration.Dynam
// Have to add in a separate loop since spec requires no updates at all
// if there is an issue
if (conflicts.isEmpty()) {
- for (Map.Entry<String, String> entry : initParameters.entrySet()) {
+ for (Map.Entry<String,String> entry : initParameters.entrySet()) {
setInitParameter(entry.getKey(), entry.getValue());
}
}
diff --git a/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
b/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
index ab71ead321..c9f6bda066 100644
--- a/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
+++ b/java/org/apache/catalina/core/ApplicationSessionCookieConfig.java
@@ -40,7 +40,7 @@ public class ApplicationSessionCookieConfig implements
SessionCookieConfig {
private static final boolean DEFAULT_HTTP_ONLY = false;
private static final boolean DEFAULT_SECURE = false;
- private final Map<String, String> attributes = new
TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+ private final Map<String,String> attributes = new
TreeMap<>(String.CASE_INSENSITIVE_ORDER);
private String name;
private StandardContext context;
@@ -175,7 +175,7 @@ public class ApplicationSessionCookieConfig implements
SessionCookieConfig {
@Override
- public Map<String, String> getAttributes() {
+ public Map<String,String> getAttributes() {
return Collections.unmodifiableMap(attributes);
}
@@ -224,7 +224,7 @@ public class ApplicationSessionCookieConfig implements
SessionCookieConfig {
cookie.setPath(SessionConfig.getSessionCookiePath(context));
// Other attributes
- for (Map.Entry<String, String> attribute :
scc.getAttributes().entrySet()) {
+ for (Map.Entry<String,String> attribute :
scc.getAttributes().entrySet()) {
switch (attribute.getKey()) {
case Constants.COOKIE_COMMENT_ATTR:
case Constants.COOKIE_DOMAIN_ATTR:
diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java
b/java/org/apache/catalina/core/AsyncContextImpl.java
index 3d2bf5f8c6..f956800455 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -386,8 +386,8 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
if (log.isDebugEnabled()) {
log.debug(sm.getString("asyncContextImpl.fireOnError"));
}
- AsyncEvent errorEvent = new AsyncEvent(event.getAsyncContext(),
event.getSuppliedRequest(),
- event.getSuppliedResponse(), t);
+ AsyncEvent errorEvent =
+ new AsyncEvent(event.getAsyncContext(),
event.getSuppliedRequest(), event.getSuppliedResponse(), t);
List<AsyncListenerWrapper> listenersCopy = new
ArrayList<>(listeners);
for (AsyncListenerWrapper listener : listenersCopy) {
try {
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index a7e7c69a4a..d7fa461628 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -128,7 +128,7 @@ public abstract class ContainerBase extends
LifecycleMBeanBase implements Contai
/**
* The child Containers belonging to this Container, keyed by name.
*/
- protected final HashMap<String, Container> children = new HashMap<>();
+ protected final HashMap<String,Container> children = new HashMap<>();
/**
diff --git a/java/org/apache/catalina/core/ContextNamingInfoListener.java
b/java/org/apache/catalina/core/ContextNamingInfoListener.java
index 58d61a738f..bacdfe404a 100644
--- a/java/org/apache/catalina/core/ContextNamingInfoListener.java
+++ b/java/org/apache/catalina/core/ContextNamingInfoListener.java
@@ -26,8 +26,7 @@ import
org.apache.tomcat.util.descriptor.web.ContextEnvironment;
import org.apache.tomcat.util.res.StringManager;
/**
- * Implementation of {@code LifecycleListener} that will create context
naming information
- * environment entries.
+ * Implementation of {@code LifecycleListener} that will create context naming
information environment entries.
* <p>
* This listener must only be nested within {@link Context} elements.
* <p>
@@ -41,8 +40,8 @@ import org.apache.tomcat.util.res.StringManager;
* <li>Display Name: {@code context/displayName} from {@link
Context#getDisplayName()}</li>
* </ul>
* <p>
- * See the <a
href="https://tomcat.apache.org/tomcat-11.0-doc/config/context.html#Naming";>Tomcat
- * documentation</a> for more details on the values.
+ * See the <a
href="https://tomcat.apache.org/tomcat-11.0-doc/config/context.html#Naming";>Tomcat
documentation</a> for
+ * more details on the values.
*/
public class ContextNamingInfoListener implements LifecycleListener {
@@ -62,8 +61,8 @@ public class ContextNamingInfoListener implements
LifecycleListener {
private boolean emptyOnRoot = true;
/**
- * Sets whether for the root context {@code context/path} and {@code
context/encodedPath} will
- * contain {@code "/"} and {@code context/name} will contain {@code
"ROOT"} with a version, if any.
+ * Sets whether for the root context {@code context/path} and {@code
context/encodedPath} will contain {@code "/"}
+ * and {@code context/name} will contain {@code "ROOT"} with a version, if
any.
*
* @param emptyOnRoot whether paths and name for root context shall be
empty
*/
@@ -113,7 +112,7 @@ public class ContextNamingInfoListener implements
LifecycleListener {
ce.setType("java.lang.String");
ce.setValue(value);
if (log.isDebugEnabled()) {
- log.info(sm.getString("contextNamingInfoListener.envEntry",name,
value));
+ log.info(sm.getString("contextNamingInfoListener.envEntry", name,
value));
}
context.getNamingResources().addEnvironment(ce);
}
diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java
b/java/org/apache/catalina/core/DefaultInstanceManager.java
index b4d0e856b2..c0fe2c6f73 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -92,18 +92,19 @@ public class DefaultInstanceManager implements
InstanceManager {
private final Context context;
- private final Map<String, Map<String, String>> injectionMap;
+ private final Map<String,Map<String,String>> injectionMap;
protected final ClassLoader classLoader;
protected final ClassLoader containerClassLoader;
protected final boolean privileged;
protected final boolean ignoreAnnotations;
protected final boolean metadataComplete;
private final Set<String> restrictedClasses;
- private final ManagedConcurrentWeakHashMap<Class<?>,
AnnotationCacheEntry[]> annotationCache = new ManagedConcurrentWeakHashMap<>();
- private final Map<String, String> postConstructMethods;
- private final Map<String, String> preDestroyMethods;
+ private final
ManagedConcurrentWeakHashMap<Class<?>,AnnotationCacheEntry[]> annotationCache =
+ new ManagedConcurrentWeakHashMap<>();
+ private final Map<String,String> postConstructMethods;
+ private final Map<String,String> preDestroyMethods;
- public DefaultInstanceManager(Context context, Map<String, Map<String,
String>> injectionMap,
+ public DefaultInstanceManager(Context context,
Map<String,Map<String,String>> injectionMap,
org.apache.catalina.Context catalinaContext, ClassLoader
containerClassLoader) {
classLoader = catalinaContext.getLoader().getClassLoader();
privileged = catalinaContext.getPrivileged();
@@ -155,7 +156,7 @@ public class DefaultInstanceManager implements
InstanceManager {
private Object newInstance(Object instance, Class<?> clazz)
throws IllegalAccessException, InvocationTargetException,
NamingException {
if (!ignoreAnnotations) {
- Map<String, String> injections =
assembleInjectionsFromClassHierarchy(clazz);
+ Map<String,String> injections =
assembleInjectionsFromClassHierarchy(clazz);
populateAnnotationsCache(clazz, injections);
processAnnotations(instance, injections);
postConstruct(instance, clazz);
@@ -163,9 +164,9 @@ public class DefaultInstanceManager implements
InstanceManager {
return instance;
}
- private Map<String, String> assembleInjectionsFromClassHierarchy(Class<?>
clazz) {
- Map<String, String> injections = new HashMap<>();
- Map<String, String> currentInjections = null;
+ private Map<String,String> assembleInjectionsFromClassHierarchy(Class<?>
clazz) {
+ Map<String,String> injections = new HashMap<>();
+ Map<String,String> currentInjections = null;
while (clazz != null) {
currentInjections = this.injectionMap.get(clazz.getName());
if (currentInjections != null) {
@@ -272,7 +273,7 @@ public class DefaultInstanceManager implements
InstanceManager {
* @throws javax.naming.NamingException if value cannot be
looked up in jndi
* @throws java.lang.reflect.InvocationTargetException if injection fails
*/
- protected void populateAnnotationsCache(Class<?> clazz, Map<String,
String> injections)
+ protected void populateAnnotationsCache(Class<?> clazz, Map<String,String>
injections)
throws IllegalAccessException, InvocationTargetException,
NamingException {
List<AnnotationCacheEntry> annotations = null;
@@ -322,8 +323,8 @@ public class DefaultInstanceManager implements
InstanceManager {
annotations.add(new
AnnotationCacheEntry(method.getName(), method.getParameterTypes(),
((WebServiceRef)
webServiceRefAnnotation).name(),
AnnotationCacheEntryType.SETTER));
- } else if (JPA_PRESENT &&
(persistenceContextAnnotation = method
- .getAnnotation(PersistenceContext.class))
!= null) {
+ } else if (JPA_PRESENT &&
(persistenceContextAnnotation =
+
method.getAnnotation(PersistenceContext.class)) != null) {
annotations.add(new
AnnotationCacheEntry(method.getName(), method.getParameterTypes(),
((PersistenceContext)
persistenceContextAnnotation).name(),
AnnotationCacheEntryType.SETTER));
@@ -383,8 +384,8 @@ public class DefaultInstanceManager implements
InstanceManager {
annotations.add(new
AnnotationCacheEntry(fieldName, null,
((WebServiceRef)
webServiceRefAnnotation).name(),
AnnotationCacheEntryType.FIELD));
- } else if (JPA_PRESENT &&
(persistenceContextAnnotation = field
- .getAnnotation(PersistenceContext.class))
!= null) {
+ } else if (JPA_PRESENT &&
(persistenceContextAnnotation =
+
field.getAnnotation(PersistenceContext.class)) != null) {
annotations.add(new
AnnotationCacheEntry(fieldName, null,
((PersistenceContext)
persistenceContextAnnotation).name(),
AnnotationCacheEntryType.FIELD));
@@ -423,7 +424,7 @@ public class DefaultInstanceManager implements
InstanceManager {
* @throws javax.naming.NamingException if value cannot be
looked up in jndi
* @throws java.lang.reflect.InvocationTargetException if injection fails
*/
- protected void processAnnotations(Object instance, Map<String, String>
injections)
+ protected void processAnnotations(Object instance, Map<String,String>
injections)
throws IllegalAccessException, InvocationTargetException,
NamingException {
if (context == null) {
@@ -578,7 +579,7 @@ public class DefaultInstanceManager implements
InstanceManager {
if (properties.isEmpty()) {
return;
}
- for (Map.Entry<Object, Object> e : properties.entrySet()) {
+ for (Map.Entry<Object,Object> e : properties.entrySet()) {
if ("restricted".equals(e.getValue())) {
classNames.add(e.getKey().toString());
} else {
@@ -680,6 +681,9 @@ public class DefaultInstanceManager implements
InstanceManager {
private enum AnnotationCacheEntryType {
- FIELD, SETTER, POST_CONSTRUCT, PRE_DESTROY
+ FIELD,
+ SETTER,
+ POST_CONSTRUCT,
+ PRE_DESTROY
}
}
diff --git a/java/org/apache/catalina/core/FrameworkListener.java
b/java/org/apache/catalina/core/FrameworkListener.java
index 3796390190..e454d0886a 100644
--- a/java/org/apache/catalina/core/FrameworkListener.java
+++ b/java/org/apache/catalina/core/FrameworkListener.java
@@ -36,7 +36,7 @@ import org.apache.catalina.Service;
*/
public abstract class FrameworkListener implements LifecycleListener,
ContainerListener {
- protected final ConcurrentHashMap<Context, LifecycleListener>
contextListeners = new ConcurrentHashMap<>();
+ protected final ConcurrentHashMap<Context,LifecycleListener>
contextListeners = new ConcurrentHashMap<>();
/**
* Create a lifecycle listener which will then be added to the specified
context.
diff --git a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
index babf34ad90..ac1c8573eb 100644
--- a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
+++ b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
@@ -186,9 +186,8 @@ public class JreMemoryLeakPreventionListener implements
LifecycleListener {
}
/*
- * Initialize the SeedGenerator of the JVM, as some platforms
use
- * a thread which could end up being associated with a webapp
rather
- * than the container.
+ * Initialize the SeedGenerator of the JVM, as some platforms
use a thread which could end up being
+ * associated with a webapp rather than the container.
*/
if (initSeedGenerator) {
SecureRandom.getSeed(1);
diff --git a/java/org/apache/catalina/core/NamingContextListener.java
b/java/org/apache/catalina/core/NamingContextListener.java
index 30d00997a0..d995abde84 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -136,7 +136,7 @@ public class NamingContextListener implements
LifecycleListener, PropertyChangeL
/**
* Objectnames Map.
*/
- protected HashMap<String, ObjectName> objectNames = new HashMap<>();
+ protected HashMap<String,ObjectName> objectNames = new HashMap<>();
/**
@@ -222,7 +222,7 @@ public class NamingContextListener implements
LifecycleListener, PropertyChangeL
}
try {
- Hashtable<String, Object> contextEnv = new Hashtable<>();
+ Hashtable<String,Object> contextEnv = new Hashtable<>();
namingContext = new NamingContext(contextEnv, getName());
ContextAccessController.setSecurityToken(getName(), token);
ContextAccessController.setSecurityToken(container, token);
@@ -848,8 +848,8 @@ public class NamingContextListener implements
LifecycleListener, PropertyChangeL
}
if (jaxrpcURL == null) {
try {
- jaxrpcURL = ((Context) container).getServletContext()
- .getResource(service.getJaxrpcmappingfile());
+ jaxrpcURL =
+ ((Context)
container).getServletContext().getResource(service.getJaxrpcmappingfile());
} catch (MalformedURLException e) {
// Ignore and carry on
}
@@ -1021,8 +1021,8 @@ public class NamingContextListener implements
LifecycleListener, PropertyChangeL
public void addResourceLink(ContextResourceLink resourceLink) {
// Create a reference to the resource.
- Reference ref = new ResourceLinkRef(resourceLink.getType(),
resourceLink.getGlobal(), resourceLink.getFactory(),
- null);
+ Reference ref =
+ new ResourceLinkRef(resourceLink.getType(),
resourceLink.getGlobal(), resourceLink.getFactory(), null);
Iterator<String> i = resourceLink.listProperties();
while (i.hasNext()) {
String key = i.next();
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 5d1cc905ad..6476bf08c5 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -227,7 +227,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
/**
* The ordered set of ServletContainerInitializers for this web
application.
*/
- private Map<ServletContainerInitializer, Set<Class<?>>> initializers = new
LinkedHashMap<>();
+ private Map<ServletContainerInitializer,Set<Class<?>>> initializers = new
LinkedHashMap<>();
/**
@@ -357,13 +357,13 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
/**
* The set of filter configurations (and associated filter instances) we
have initialized, keyed by filter name.
*/
- private Map<String, ApplicationFilterConfig> filterConfigs = new
HashMap<>();
+ private Map<String,ApplicationFilterConfig> filterConfigs = new
HashMap<>();
/**
* The set of filter definitions for this application, keyed by filter
name.
*/
- private Map<String, FilterDef> filterDefs = new HashMap<>();
+ private Map<String,FilterDef> filterDefs = new HashMap<>();
/**
@@ -419,19 +419,19 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
/**
* The message destinations for this web application.
*/
- private HashMap<String, MessageDestination> messageDestinations = new
HashMap<>();
+ private HashMap<String,MessageDestination> messageDestinations = new
HashMap<>();
/**
* The MIME mappings for this web application, keyed by extension.
*/
- private Map<String, String> mimeMappings = new HashMap<>();
+ private Map<String,String> mimeMappings = new HashMap<>();
/**
* The context initialization parameters for this web application, keyed
by name.
*/
- private final Map<String, String> parameters = new ConcurrentHashMap<>();
+ private final Map<String,String> parameters = new ConcurrentHashMap<>();
/**
@@ -494,7 +494,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
/**
* The security role mappings for this application, keyed by role name (as
used within the application).
*/
- private Map<String, String> roleMappings = new HashMap<>();
+ private Map<String,String> roleMappings = new HashMap<>();
/**
@@ -508,7 +508,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
/**
* The servlet mappings for this web application, keyed by matching
pattern.
*/
- private Map<String, String> servletMappings = new HashMap<>();
+ private Map<String,String> servletMappings = new HashMap<>();
private final Object servletMappingsLock = new Object();
@@ -746,8 +746,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
private boolean jndiExceptionOnFailedWrite = true;
- private Map<String, String> postConstructMethods = new HashMap<>();
- private Map<String, String> preDestroyMethods = new HashMap<>();
+ private Map<String,String> postConstructMethods = new HashMap<>();
+ private Map<String,String> preDestroyMethods = new HashMap<>();
private String containerSciFilter;
@@ -4267,7 +4267,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
boolean ok = true;
synchronized (filterConfigs) {
filterConfigs.clear();
- for (Entry<String, FilterDef> entry : filterDefs.entrySet()) {
+ for (Entry<String,FilterDef> entry : filterDefs.entrySet()) {
String name = entry.getKey();
if (getLogger().isDebugEnabled()) {
getLogger().debug(" Starting filter '" + name + "'");
@@ -4301,7 +4301,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
// Release all Filter and FilterConfig instances
synchronized (filterConfigs) {
- for (Entry<String, ApplicationFilterConfig> entry :
filterConfigs.entrySet()) {
+ for (Entry<String,ApplicationFilterConfig> entry :
filterConfigs.entrySet()) {
if (getLogger().isDebugEnabled()) {
getLogger().debug(" Stopping filter '" + entry.getKey() +
"'");
}
@@ -4586,7 +4586,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
public boolean loadOnStartup(Container children[]) {
// Collect "load on startup" servlets that need to be initialized
- TreeMap<Integer, ArrayList<Wrapper>> map = new TreeMap<>();
+ TreeMap<Integer,ArrayList<Wrapper>> map = new TreeMap<>();
for (Container child : children) {
Wrapper wrapper = (Wrapper) child;
int loadOnStartup = wrapper.getLoadOnStartup();
@@ -4637,8 +4637,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
// Send j2ee.state.starting notification
if (this.getObjectName() != null) {
- Notification notification = new
Notification("j2ee.state.starting", this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.state.starting",
this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
@@ -4845,7 +4845,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
mergeParameters();
// Call ServletContainerInitializers
- for (Map.Entry<ServletContainerInitializer, Set<Class<?>>> entry :
initializers.entrySet()) {
+ for (Map.Entry<ServletContainerInitializer,Set<Class<?>>> entry :
initializers.entrySet()) {
try {
entry.getKey().onStartup(entry.getValue(),
getServletContext());
} catch (ServletException e) {
@@ -4917,8 +4917,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
// Send j2ee.state.running notification
if (ok && (this.getObjectName() != null)) {
- Notification notification = new Notification("j2ee.state.running",
this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.state.running",
this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
@@ -4933,8 +4933,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
setState(LifecycleState.FAILED);
// Send j2ee.object.failed notification
if (this.getObjectName() != null) {
- Notification notification = new
Notification("j2ee.object.failed", this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.object.failed",
this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
} else {
@@ -4944,8 +4944,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
private void checkConstraintsForUncoveredMethods(SecurityConstraint[]
constraints) {
- SecurityConstraint[] newConstraints =
SecurityConstraint.findUncoveredHttpMethods(constraints,
- getDenyUncoveredHttpMethods(), getLogger());
+ SecurityConstraint[] newConstraints =
+ SecurityConstraint.findUncoveredHttpMethods(constraints,
getDenyUncoveredHttpMethods(), getLogger());
for (SecurityConstraint constraint : newConstraints) {
addConstraint(constraint);
}
@@ -4958,13 +4958,13 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
if (isUseNaming() && getNamingContextListener() != null) {
context = getNamingContextListener().getEnvContext();
}
- Map<String, Map<String, String>> injectionMap = buildInjectionMap(
- getIgnoreAnnotations() ? new NamingResourcesImpl() :
getNamingResources());
+ Map<String,Map<String,String>> injectionMap =
+ buildInjectionMap(getIgnoreAnnotations() ? new
NamingResourcesImpl() : getNamingResources());
return new DefaultInstanceManager(context, injectionMap, this,
this.getClass().getClassLoader());
}
- private Map<String, Map<String, String>>
buildInjectionMap(NamingResourcesImpl namingResources) {
- Map<String, Map<String, String>> injectionMap = new HashMap<>();
+ private Map<String,Map<String,String>>
buildInjectionMap(NamingResourcesImpl namingResources) {
+ Map<String,Map<String,String>> injectionMap = new HashMap<>();
for (Injectable resource : namingResources.findLocalEjbs()) {
addInjectionTarget(resource, injectionMap);
}
@@ -4989,7 +4989,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
return injectionMap;
}
- private void addInjectionTarget(Injectable resource, Map<String,
Map<String, String>> injectionMap) {
+ private void addInjectionTarget(Injectable resource,
Map<String,Map<String,String>> injectionMap) {
List<InjectionTarget> injectionTargets =
resource.getInjectionTargets();
if (injectionTargets != null && injectionTargets.size() > 0) {
String jndiName = resource.getName();
@@ -5008,7 +5008,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
* the application parameters appropriately.
*/
private void mergeParameters() {
- Map<String, String> mergedParams = new HashMap<>();
+ Map<String,String> mergedParams = new HashMap<>();
String names[] = findParameters();
for (String s : names) {
@@ -5025,7 +5025,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
}
ServletContext sc = getServletContext();
- for (Map.Entry<String, String> entry : mergedParams.entrySet()) {
+ for (Map.Entry<String,String> entry : mergedParams.entrySet()) {
sc.setInitParameter(entry.getKey(), entry.getValue());
}
@@ -5044,8 +5044,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
// Send j2ee.state.stopping notification
if (this.getObjectName() != null) {
- Notification notification = new
Notification("j2ee.state.stopping", this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.state.stopping",
this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
@@ -5145,8 +5145,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
// Send j2ee.state.stopped notification
if (this.getObjectName() != null) {
- Notification notification = new Notification("j2ee.state.stopped",
this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.state.stopped",
this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
@@ -5182,8 +5182,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
// have been set so the notification can't be created
if (getObjectName() != null) {
// Send j2ee.object.deleted notification
- Notification notification = new
Notification("j2ee.object.deleted", this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.object.deleted",
this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
@@ -5385,8 +5385,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
// If the pattern did not conflict, add the new constraint(s).
if (!foundConflict) {
- SecurityConstraint[] newSecurityConstraints =
SecurityConstraint
- .createConstraints(servletSecurityElement, urlPattern);
+ SecurityConstraint[] newSecurityConstraints =
+
SecurityConstraint.createConstraints(servletSecurityElement, urlPattern);
for (SecurityConstraint securityConstraint :
newSecurityConstraints) {
addConstraint(securityConstraint);
}
@@ -5680,13 +5680,13 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
@Override
- public Map<String, String> findPostConstructMethods() {
+ public Map<String,String> findPostConstructMethods() {
return postConstructMethods;
}
@Override
- public Map<String, String> findPreDestroyMethods() {
+ public Map<String,String> findPreDestroyMethods() {
return preDestroyMethods;
}
@@ -5872,8 +5872,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
// Send j2ee.object.created notification
if (this.getObjectName() != null) {
- Notification notification = new
Notification("j2ee.object.created", this.getObjectName(),
- sequenceNumber.getAndIncrement());
+ Notification notification =
+ new Notification("j2ee.object.created",
this.getObjectName(), sequenceNumber.getAndIncrement());
broadcaster.sendNotification(notification);
}
}
@@ -6189,7 +6189,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
}
@Override
- public Map<String, ? extends ServletRegistration>
getServletRegistrations() {
+ public Map<String,? extends ServletRegistration>
getServletRegistrations() {
throw new
UnsupportedOperationException(sm.getString("noPluggabilityServletContext.notAllowed"));
}
@@ -6220,7 +6220,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
}
@Override
- public Map<String, ? extends FilterRegistration>
getFilterRegistrations() {
+ public Map<String,? extends FilterRegistration>
getFilterRegistrations() {
throw new
UnsupportedOperationException(sm.getString("noPluggabilityServletContext.notAllowed"));
}
diff --git a/java/org/apache/catalina/core/StandardHost.java
b/java/org/apache/catalina/core/StandardHost.java
index f2297fa2e0..14e6dbc64a 100644
--- a/java/org/apache/catalina/core/StandardHost.java
+++ b/java/org/apache/catalina/core/StandardHost.java
@@ -170,7 +170,7 @@ public class StandardHost extends ContainerBase implements
Host {
/**
* Track the class loaders for the child web applications so memory leaks
can be detected.
*/
- private final Map<ClassLoader, String> childClassLoaders = new
WeakHashMap<>();
+ private final Map<ClassLoader,String> childClassLoaders = new
WeakHashMap<>();
/**
@@ -745,7 +745,7 @@ public class StandardHost extends ContainerBase implements
Host {
List<String> result = new ArrayList<>();
- for (Map.Entry<ClassLoader, String> entry :
childClassLoaders.entrySet()) {
+ for (Map.Entry<ClassLoader,String> entry :
childClassLoaders.entrySet()) {
ClassLoader cl = entry.getKey();
if (cl instanceof WebappClassLoaderBase) {
if (!((WebappClassLoaderBase) cl).getState().isAvailable()) {
@@ -833,8 +833,8 @@ public class StandardHost extends ContainerBase implements
Host {
}
}
if (!found) {
- Valve valve =
ErrorReportValve.class.getName().equals(errorValve) ? new ErrorReportValve()
- : (Valve)
Class.forName(errorValve).getConstructor().newInstance();
+ Valve valve =
ErrorReportValve.class.getName().equals(errorValve) ? new ErrorReportValve() :
+ (Valve)
Class.forName(errorValve).getConstructor().newInstance();
getPipeline().addValve(valve);
}
} catch (Throwable t) {
diff --git a/java/org/apache/catalina/core/StandardServer.java
b/java/org/apache/catalina/core/StandardServer.java
index a4383f2503..7d2cbced6b 100644
--- a/java/org/apache/catalina/core/StandardServer.java
+++ b/java/org/apache/catalina/core/StandardServer.java
@@ -446,8 +446,7 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
scheduledThreadPoolExecutor.setRemoveOnCancelPolicy(true);
scheduledThreadPoolExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
utilityExecutor = scheduledThreadPoolExecutor;
- utilityExecutorWrapper = new
org.apache.tomcat.util.threads.ScheduledThreadPoolExecutor(
- utilityExecutor);
+ utilityExecutorWrapper = new
org.apache.tomcat.util.threads.ScheduledThreadPoolExecutor(utilityExecutor);
}
}
@@ -933,9 +932,9 @@ public final class StandardServer extends
LifecycleMBeanBase implements Server {
log.error(sm.getString("standardServer.periodicEventError"), e);
}
}
- periodicLifecycleEventFuture =
getUtilityExecutor().scheduleAtFixedRate(
- () -> fireLifecycleEvent(Lifecycle.PERIODIC_EVENT, null),
periodicEventDelay, periodicEventDelay,
- TimeUnit.SECONDS);
+ periodicLifecycleEventFuture =
+ getUtilityExecutor().scheduleAtFixedRate(() ->
fireLifecycleEvent(Lifecycle.PERIODIC_EVENT, null),
+ periodicEventDelay, periodicEventDelay,
TimeUnit.SECONDS);
}
}
diff --git a/java/org/apache/catalina/core/StandardWrapper.java
b/java/org/apache/catalina/core/StandardWrapper.java
index a3006fb496..1bef8ecb81 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -142,14 +142,14 @@ public class StandardWrapper extends ContainerBase
implements ServletConfig, Wra
/**
* The initialization parameters for this servlet, keyed by parameter name.
*/
- protected HashMap<String, String> parameters = new HashMap<>();
+ protected HashMap<String,String> parameters = new HashMap<>();
/**
* The security role references for this servlet, keyed by role name used
in the servlet. The corresponding value is
* the role name of the web application itself.
*/
- protected HashMap<String, String> references = new HashMap<>();
+ protected HashMap<String,String> references = new HashMap<>();
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
