This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7d27aa967306fbd0167d5c69faa267b40dd2ff66
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 8 10:10:22 2019 +0100
Clean-up. Whitespace, braces
---
.../apache/catalina/core/ApplicationContext.java | 94 +++++++++-------------
1 file changed, 39 insertions(+), 55 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index 87eab5a..fe70a32 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -180,8 +180,7 @@ public class ApplicationContext implements ServletContext {
/**
* The string manager for this package.
*/
- private static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ private static final StringManager sm =
StringManager.getManager(Constants.Package);
/**
@@ -594,8 +593,7 @@ public class ApplicationContext implements ServletContext {
return null;
}
if (!path.startsWith("/")) {
- throw new IllegalArgumentException
- (sm.getString("applicationContext.resourcePaths.iae", path));
+ throw new IllegalArgumentException
(sm.getString("applicationContext.resourcePaths.iae", path));
}
WebResourceRoot resources = context.getResources();
@@ -676,26 +674,23 @@ public class ApplicationContext implements ServletContext
{
// Notify interested application event listeners
Object listeners[] = context.getApplicationEventListeners();
- if ((listeners == null) || (listeners.length == 0))
+ if ((listeners == null) || (listeners.length == 0)) {
return;
- ServletContextAttributeEvent event =
- new ServletContextAttributeEvent(context.getServletContext(),
- name, value);
+ }
+ ServletContextAttributeEvent event = new ServletContextAttributeEvent(
+ context.getServletContext(), name, value);
for (int i = 0; i < listeners.length; i++) {
- if (!(listeners[i] instanceof ServletContextAttributeListener))
+ if (!(listeners[i] instanceof ServletContextAttributeListener)) {
continue;
- ServletContextAttributeListener listener =
- (ServletContextAttributeListener) listeners[i];
+ }
+ ServletContextAttributeListener listener =
(ServletContextAttributeListener) listeners[i];
try {
- context.fireContainerEvent("beforeContextAttributeRemoved",
- listener);
+ context.fireContainerEvent("beforeContextAttributeRemoved",
listener);
listener.attributeRemoved(event);
- context.fireContainerEvent("afterContextAttributeRemoved",
- listener);
+ context.fireContainerEvent("afterContextAttributeRemoved",
listener);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- context.fireContainerEvent("afterContextAttributeRemoved",
- listener);
+ context.fireContainerEvent("afterContextAttributeRemoved",
listener);
// FIXME - should we do anything besides log these?
log(sm.getString("applicationContext.attributeEvent"), t);
}
@@ -707,8 +702,7 @@ public class ApplicationContext implements ServletContext {
public void setAttribute(String name, Object value) {
// Name cannot be null
if (name == null) {
- throw new NullPointerException
- (sm.getString("applicationContext.setAttribute.namenull"));
+ throw new
NullPointerException(sm.getString("applicationContext.setAttribute.namenull"));
}
// Null value is the same as removeAttribute()
@@ -719,53 +713,47 @@ public class ApplicationContext implements ServletContext
{
// Add or replace the specified attribute
// Check for read only attribute
- if (readOnlyAttributes.containsKey(name))
+ if (readOnlyAttributes.containsKey(name)) {
return;
+ }
Object oldValue = attributes.put(name, value);
boolean replaced = oldValue != null;
// Notify interested application event listeners
Object listeners[] = context.getApplicationEventListeners();
- if ((listeners == null) || (listeners.length == 0))
+ if ((listeners == null) || (listeners.length == 0)) {
return;
+ }
ServletContextAttributeEvent event = null;
- if (replaced)
- event =
- new ServletContextAttributeEvent(context.getServletContext(),
- name, oldValue);
- else
- event =
- new ServletContextAttributeEvent(context.getServletContext(),
- name, value);
+ if (replaced) {
+ event = new
ServletContextAttributeEvent(context.getServletContext(), name, oldValue);
+ } else {
+ event = new
ServletContextAttributeEvent(context.getServletContext(), name, value);
+ }
for (int i = 0; i < listeners.length; i++) {
- if (!(listeners[i] instanceof ServletContextAttributeListener))
+ if (!(listeners[i] instanceof ServletContextAttributeListener)) {
continue;
- ServletContextAttributeListener listener =
- (ServletContextAttributeListener) listeners[i];
+ }
+ ServletContextAttributeListener listener =
(ServletContextAttributeListener) listeners[i];
try {
if (replaced) {
- context.fireContainerEvent
- ("beforeContextAttributeReplaced", listener);
+
context.fireContainerEvent("beforeContextAttributeReplaced", listener);
listener.attributeReplaced(event);
- context.fireContainerEvent("afterContextAttributeReplaced",
- listener);
+
context.fireContainerEvent("afterContextAttributeReplaced", listener);
} else {
- context.fireContainerEvent("beforeContextAttributeAdded",
- listener);
+ context.fireContainerEvent("beforeContextAttributeAdded",
listener);
listener.attributeAdded(event);
- context.fireContainerEvent("afterContextAttributeAdded",
- listener);
+ context.fireContainerEvent("afterContextAttributeAdded",
listener);
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- if (replaced)
- context.fireContainerEvent("afterContextAttributeReplaced",
- listener);
- else
- context.fireContainerEvent("afterContextAttributeAdded",
- listener);
+ if (replaced) {
+
context.fireContainerEvent("afterContextAttributeReplaced", listener);
+ } else {
+ context.fireContainerEvent("afterContextAttributeAdded",
listener);
+ }
// FIXME - should we do anything besides log these?
log(sm.getString("applicationContext.attributeEvent"), t);
}
@@ -978,8 +966,7 @@ public class ApplicationContext implements ServletContext {
@Override
- public <T extends Servlet> T createServlet(Class<T> c)
- throws ServletException {
+ public <T extends Servlet> T createServlet(Class<T> c) throws
ServletException {
try {
@SuppressWarnings("unchecked")
T servlet = (T)
context.getInstanceManager().newInstance(c.getName());
@@ -1085,8 +1072,7 @@ public class ApplicationContext implements ServletContext
{
public boolean setInitParameter(String name, String value) {
// Name cannot be null
if (name == null) {
- throw new NullPointerException
- (sm.getString("applicationContext.setAttribute.namenull"));
+ throw new
NullPointerException(sm.getString("applicationContext.setAttribute.namenull"));
}
if (!context.getState().equals(LifecycleState.STARTING_PREP)) {
throw new IllegalStateException(
@@ -1160,9 +1146,8 @@ public class ApplicationContext implements ServletContext
{
match = true;
}
- if (t instanceof HttpSessionListener
- || (t instanceof ServletContextListener &&
- newServletContextListenerAllowed)) {
+ if (t instanceof HttpSessionListener ||
+ (t instanceof ServletContextListener &&
newServletContextListenerAllowed)) {
// Add listener directly to the list of instances rather than to
// the list of class names.
context.addApplicationLifecycleListener(t);
@@ -1188,8 +1173,7 @@ public class ApplicationContext implements ServletContext
{
throws ServletException {
try {
@SuppressWarnings("unchecked")
- T listener =
- (T) context.getInstanceManager().newInstance(c);
+ T listener = (T) context.getInstanceManager().newInstance(c);
if (listener instanceof ServletContextListener ||
listener instanceof ServletContextAttributeListener ||
listener instanceof ServletRequestListener ||
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
