This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 041ae238ca41386a3a8205528664ce48e619d183
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri May 1 23:13:26 2020 +0100
Additional clean-up after enhanced for loop changes
---
java/javax/el/Util.java | 6 +--
.../servlet/jsp/el/ImplicitObjectELResolver.java | 20 ++++-----
.../javax/servlet/jsp/tagext/SimpleTagSupport.java | 3 +-
.../javax/servlet/jsp/tagext/TagAttributeInfo.java | 6 +--
java/org/apache/catalina/connector/Request.java | 6 +--
.../catalina/core/ApplicationFilterFactory.java | 8 ++--
java/org/apache/catalina/core/StandardContext.java | 23 +++++-----
.../catalina/ha/context/ReplicatedContext.java | 20 +++++----
.../catalina/loader/WebappClassLoaderBase.java | 3 +-
.../manager/host/HTMLHostManagerServlet.java | 32 ++++++--------
java/org/apache/catalina/realm/RealmBase.java | 32 +++++++-------
.../apache/catalina/session/StandardSession.java | 49 ++++++++-------------
java/org/apache/catalina/startup/Catalina.java | 18 +++-----
.../catalina/startup/ClassLoaderFactory.java | 23 ++++++----
.../interceptors/FragmentationInterceptor.java | 4 +-
.../tribes/transport/nio/NioReplicationTask.java | 13 +-----
.../apache/catalina/util/ExtensionValidator.java | 9 +---
.../catalina/valves/AbstractAccessLogValve.java | 6 +--
java/org/apache/el/util/ReflectionUtil.java | 6 +--
java/org/apache/jasper/JspC.java | 17 ++++----
java/org/apache/jasper/compiler/Generator.java | 12 ++----
java/org/apache/jasper/compiler/JspUtil.java | 8 ++--
.../apache/jasper/servlet/JspCServletContext.java | 3 +-
.../tomcat/dbcp/dbcp2/DelegatingConnection.java | 3 +-
.../org/apache/tomcat/util/IntrospectionUtils.java | 9 ++--
java/org/apache/tomcat/util/buf/ByteChunk.java | 1 -
.../apache/tomcat/util/modeler/BaseModelMBean.java | 1 -
.../MbeansDescriptorsIntrospectionSource.java | 6 +--
.../tomcat/util/net/openssl/OpenSSLConf.java | 6 +--
.../tomcat/websocket/AuthenticatorFactory.java | 1 -
.../group/TestGroupChannelMemberArrival.java | 4 +-
.../interceptors/TestDomainFilterInterceptor.java | 2 +-
.../group/interceptors/TestOrderInterceptor.java | 4 +-
.../tribes/test/channel/TestDataIntegrity.java | 50 +++++++++++-----------
.../tribes/test/channel/TestMulticastPackages.java | 4 +-
.../tribes/test/channel/TestUdpPackages.java | 8 ++--
webapps/examples/jsp/checkbox/checkresult.jsp | 20 +++++----
webapps/examples/jsp/sessions/carts.jsp | 4 +-
38 files changed, 199 insertions(+), 251 deletions(-)
diff --git a/java/javax/el/Util.java b/java/javax/el/Util.java
index cb1590c..2a01f3a 100644
--- a/java/javax/el/Util.java
+++ b/java/javax/el/Util.java
@@ -550,11 +550,11 @@ class Util {
(jreCompat.canAcccess(base, m) || base != null &&
jreCompat.canAcccess(null, m)))) {
return m;
}
- Class<?>[] inf = type.getInterfaces();
+ Class<?>[] interfaces = type.getInterfaces();
Method mp = null;
- for (Class<?> aClass : inf) {
+ for (Class<?> iface : interfaces) {
try {
- mp = aClass.getMethod(m.getName(), m.getParameterTypes());
+ mp = iface.getMethod(m.getName(), m.getParameterTypes());
mp = getMethod(mp.getDeclaringClass(), base, mp);
if (mp != null) {
return mp;
diff --git a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
index 819ac98..07c4557 100644
--- a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -254,12 +254,11 @@ public class ImplicitObjectELResolver extends ELResolver {
this.cookie = new ScopeMap<Cookie>() {
@Override
protected Enumeration<String> getAttributeNames() {
- Cookie[] c = ((HttpServletRequest) page.getRequest())
- .getCookies();
- if (c != null) {
+ Cookie[] cookies = ((HttpServletRequest)
page.getRequest()).getCookies();
+ if (cookies != null) {
Vector<String> v = new Vector<>();
- for (Cookie value : c) {
- v.add(value.getName());
+ for (Cookie cookie : cookies) {
+ v.add(cookie.getName());
}
return v.elements();
}
@@ -268,12 +267,11 @@ public class ImplicitObjectELResolver extends ELResolver {
@Override
protected Cookie getAttribute(String name) {
- Cookie[] c = ((HttpServletRequest) page.getRequest())
- .getCookies();
- if (c != null) {
- for (Cookie value : c) {
- if (name.equals(value.getName())) {
- return value;
+ Cookie[] cookies = ((HttpServletRequest)
page.getRequest()).getCookies();
+ if (cookies != null) {
+ for (Cookie cookie : cookies) {
+ if (name.equals(cookie.getName())) {
+ return cookie;
}
}
}
diff --git a/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
b/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
index 9d9c88f..7c6a84c 100644
--- a/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
+++ b/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
@@ -193,8 +193,7 @@ public class SimpleTagSupport implements SimpleTag {
JspTag parent = null;
if( from instanceof SimpleTag ) {
parent = ((SimpleTag)from).getParent();
- }
- else if( from instanceof Tag ) {
+ } else if( from instanceof Tag ) {
parent = ((Tag)from).getParent();
}
if (parent == null) {
diff --git a/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
b/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
index 46f4a76..63c3551 100644
--- a/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
+++ b/java/javax/servlet/jsp/tagext/TagAttributeInfo.java
@@ -167,12 +167,12 @@ public class TagAttributeInfo {
* Convenience static method that goes through an array of TagAttributeInfo
* objects and looks for "id".
*
- * @param a
+ * @param tagAttributeInfos
* An array of TagAttributeInfo
* @return The TagAttributeInfo reference with name "id"
*/
- public static TagAttributeInfo getIdAttribute(TagAttributeInfo a[]) {
- for (TagAttributeInfo tagAttributeInfo : a) {
+ public static TagAttributeInfo getIdAttribute(TagAttributeInfo[]
tagAttributeInfos) {
+ for (TagAttributeInfo tagAttributeInfo : tagAttributeInfos) {
if (tagAttributeInfo.getName().equals(ID)) {
return tagAttributeInfo;
}
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 2ea39dd..ad34a09 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -1603,8 +1603,7 @@ public class Request implements HttpServletRequest {
if (!(o instanceof ServletRequestAttributeListener)) {
continue;
}
- ServletRequestAttributeListener listener =
- (ServletRequestAttributeListener) o;
+ ServletRequestAttributeListener listener =
(ServletRequestAttributeListener) o;
try {
if (replaced) {
listener.attributeReplaced(event);
@@ -1640,8 +1639,7 @@ public class Request implements HttpServletRequest {
if (!(o instanceof ServletRequestAttributeListener)) {
continue;
}
- ServletRequestAttributeListener listener =
- (ServletRequestAttributeListener) o;
+ ServletRequestAttributeListener listener =
(ServletRequestAttributeListener) o;
try {
listener.attributeRemoved(event);
} catch (Throwable t) {
diff --git a/java/org/apache/catalina/core/ApplicationFilterFactory.java
b/java/org/apache/catalina/core/ApplicationFilterFactory.java
index 5b6db99..b5bd81b 100644
--- a/java/org/apache/catalina/core/ApplicationFilterFactory.java
+++ b/java/org/apache/catalina/core/ApplicationFilterFactory.java
@@ -100,14 +100,14 @@ public final class ApplicationFilterFactory {
String servletName = wrapper.getName();
// Add the relevant path-mapped filters to this filter chain
- for (FilterMap map : filterMaps) {
- if (!matchDispatcher(map, dispatcher)) {
+ for (FilterMap filterMap : filterMaps) {
+ if (!matchDispatcher(filterMap, dispatcher)) {
continue;
}
- if (!matchFiltersURL(map, requestPath))
+ if (!matchFiltersURL(filterMap, requestPath))
continue;
ApplicationFilterConfig filterConfig = (ApplicationFilterConfig)
- context.findFilterConfig(map.getFilterName());
+ context.findFilterConfig(filterMap.getFilterName());
if (filterConfig == null) {
// FIXME - log configuration problem
continue;
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index a6a9f2c..a4adfa6 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4685,10 +4685,10 @@ public class StandardContext extends ContainerBase
tldEvent = new ServletContextEvent(noPluggabilityServletContext);
}
for (Object instance : instances) {
- if (!(instance instanceof ServletContextListener))
+ if (!(instance instanceof ServletContextListener)) {
continue;
- ServletContextListener listener =
- (ServletContextListener) instance;
+ }
+ ServletContextListener listener = (ServletContextListener)
instance;
try {
fireContainerEvent("beforeContextInitialized", listener);
if (noPluggabilityListeners.contains(listener)) {
@@ -4700,9 +4700,8 @@ public class StandardContext extends ContainerBase
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
fireContainerEvent("afterContextInitialized", listener);
- getLogger().error
- (sm.getString("standardContext.listenerStart",
- instance.getClass().getName()), t);
+ getLogger().error(sm.getString("standardContext.listenerStart",
+ instance.getClass().getName()), t);
ok = false;
}
}
@@ -4865,8 +4864,9 @@ public class StandardContext extends ContainerBase
for (Container child : children) {
Wrapper wrapper = (Wrapper) child;
int loadOnStartup = wrapper.getLoadOnStartup();
- if (loadOnStartup < 0)
+ if (loadOnStartup < 0) {
continue;
+ }
Integer key = Integer.valueOf(loadOnStartup);
ArrayList<Wrapper> list = map.get(key);
if (list == null) {
@@ -5897,12 +5897,13 @@ public class StandardContext extends ContainerBase
new ServletRequestEvent(getServletContext(), request);
for (Object instance : instances) {
- if (instance == null)
+ if (instance == null) {
continue;
- if (!(instance instanceof ServletRequestListener))
+ }
+ if (!(instance instanceof ServletRequestListener)) {
continue;
- ServletRequestListener listener =
- (ServletRequestListener) instance;
+ }
+ ServletRequestListener listener = (ServletRequestListener)
instance;
try {
listener.requestInitialized(event);
diff --git a/java/org/apache/catalina/ha/context/ReplicatedContext.java
b/java/org/apache/catalina/ha/context/ReplicatedContext.java
index 9ed7ad0..3457567 100644
--- a/java/org/apache/catalina/ha/context/ReplicatedContext.java
+++ b/java/org/apache/catalina/ha/context/ReplicatedContext.java
@@ -195,21 +195,25 @@ public class ReplicatedContext extends StandardContext
implements MapOwner {
}
protected static class MultiEnumeration<T> implements Enumeration<T> {
- private final Enumeration<T>[] e;
- public MultiEnumeration(Enumeration<T>[] lists) {
- e = lists;
+ private final Enumeration<T>[] enumerations;
+ public MultiEnumeration(Enumeration<T>[] enumerations) {
+ this.enumerations = enumerations;
}
@Override
public boolean hasMoreElements() {
- for (Enumeration<T> tEnumeration : e) {
- if (tEnumeration.hasMoreElements()) return true;
+ for (Enumeration<T> enumeration : enumerations) {
+ if (enumeration.hasMoreElements()) {
+ return true;
+ }
}
return false;
}
@Override
public T nextElement() {
- for (Enumeration<T> tEnumeration : e) {
- if (tEnumeration.hasMoreElements()) return
tEnumeration.nextElement();
+ for (Enumeration<T> enumeration : enumerations) {
+ if (enumeration.hasMoreElements()) {
+ return enumeration.nextElement();
+ }
}
return null;
@@ -220,6 +224,4 @@ public class ReplicatedContext extends StandardContext
implements MapOwner {
public void objectMadePrimary(Object key, Object value) {
//noop
}
-
-
}
\ No newline at end of file
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 248ab61..57d2810 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -2024,8 +2024,7 @@ public abstract class WebappClassLoaderBase extends
URLClassLoader
log.error(sm.getString(
"webappClassLoader.checkThreadLocalsForLeaks",
args));
- }
- else if (value == null) {
+ } else if (value == null) {
if (log.isDebugEnabled()) {
log.debug(sm.getString(
"webappClassLoader.checkThreadLocalsForLeaksNull",
diff --git a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
index 3dd2c36..77353c8 100644
--- a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
@@ -23,8 +23,9 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URLEncoder;
import java.text.MessageFormat;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.Arrays;
+import java.util.SortedSet;
+import java.util.TreeSet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -311,29 +312,22 @@ public final class HTMLHostManagerServlet extends
HostManagerServlet {
writer.print(MessageFormat.format(HOSTS_HEADER_SECTION, args));
// Hosts Row Section
- // Create sorted map of host names.
+ // Create sorted set of host names.
Container[] children = engine.findChildren();
String hostNames[] = new String[children.length];
- for (int i = 0; i < children.length; i++)
+ for (int i = 0; i < children.length; i++) {
hostNames[i] = children[i].getName();
+ }
- TreeMap<String,String> sortedHostNamesMap = new TreeMap<>();
+ SortedSet<String> sortedHostNames = new TreeSet<>();
+ sortedHostNames.addAll(Arrays.asList(hostNames));
- for (String displayPath : hostNames) {
- sortedHostNamesMap.put(displayPath, displayPath);
- }
+ String hostsStart =
smClient.getString("htmlHostManagerServlet.hostsStart");
+ String hostsStop =
smClient.getString("htmlHostManagerServlet.hostsStop");
+ String hostsRemove =
smClient.getString("htmlHostManagerServlet.hostsRemove");
+ String hostThis =
smClient.getString("htmlHostManagerServlet.hostThis");
- String hostsStart =
- smClient.getString("htmlHostManagerServlet.hostsStart");
- String hostsStop =
- smClient.getString("htmlHostManagerServlet.hostsStop");
- String hostsRemove =
- smClient.getString("htmlHostManagerServlet.hostsRemove");
- String hostThis =
- smClient.getString("htmlHostManagerServlet.hostThis");
-
- for (Map.Entry<String, String> entry : sortedHostNamesMap.entrySet()) {
- String hostName = entry.getKey();
+ for (String hostName : sortedHostNames) {
Host host = (Host) engine.findChild(hostName);
if (host != null ) {
diff --git a/java/org/apache/catalina/realm/RealmBase.java
b/java/org/apache/catalina/realm/RealmBase.java
index 615928b..ae02312 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -565,11 +565,11 @@ public abstract class RealmBase extends
LifecycleMBeanBase implements org.apache
int i;
boolean found = false;
for (i = 0; i < constraints.length; i++) {
- SecurityCollection [] collection =
constraints[i].findCollections();
+ SecurityCollection[] collections =
constraints[i].findCollections();
// If collection is null, continue to avoid an NPE
// See Bugzilla 30624
- if ( collection == null) {
+ if (collections == null) {
continue;
}
@@ -579,7 +579,7 @@ public abstract class RealmBase extends LifecycleMBeanBase
implements org.apache
constraints[i].included(uri, method));
}
- for (SecurityCollection securityCollection : collection) {
+ for (SecurityCollection securityCollection : collections) {
String[] patterns = securityCollection.findPatterns();
// If patterns is null, continue to avoid an NPE
@@ -642,12 +642,9 @@ public abstract class RealmBase extends LifecycleMBeanBase
implements org.apache
if (pattern.length() == 2) {
matched = true;
length = pattern.length();
- }
- else if (pattern.regionMatches(0, uri, 0,
- pattern.length() - 1) ||
+ } else if (pattern.regionMatches(0, uri, 0,
pattern.length() - 1) ||
(pattern.length() - 2 == uri.length() &&
- pattern.regionMatches(0, uri, 0,
- pattern.length() - 2))) {
+ pattern.regionMatches(0, uri, 0,
pattern.length() - 2))) {
matched = true;
length = pattern.length();
}
@@ -845,29 +842,32 @@ public abstract class RealmBase extends
LifecycleMBeanBase implements org.apache
else if (roles.length == 0 && !constraint.getAllRoles() &&
!constraint.getAuthenticatedUsers()) {
if (constraint.getAuthConstraint()) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("No roles");
+ }
status = false; // No listed roles means no access at all
denyfromall = true;
break;
}
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Passing all access");
+ }
status = true;
- }
- else if (principal == null) {
- if (log.isDebugEnabled())
+ } else if (principal == null) {
+ if (log.isDebugEnabled()) {
log.debug(" No user authenticated, cannot grant access");
+ }
} else {
for (String role : roles) {
if (hasRole(request.getWrapper(), principal, role)) {
status = true;
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Role found: " + role);
- }
- else if (log.isDebugEnabled())
+ }
+ } else if (log.isDebugEnabled()) {
log.debug("No role found: " + role);
+ }
}
}
}
diff --git a/java/org/apache/catalina/session/StandardSession.java
b/java/org/apache/catalina/session/StandardSession.java
index a64d42a..44c41be 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -381,23 +381,19 @@ public class StandardSession implements HttpSession,
Session, Serializable {
for (Object o : listeners) {
if (!(o instanceof HttpSessionListener))
continue;
- HttpSessionListener listener =
- (HttpSessionListener) o;
+ HttpSessionListener listener = (HttpSessionListener) o;
try {
- context.fireContainerEvent("beforeSessionCreated",
- listener);
+ context.fireContainerEvent("beforeSessionCreated",
listener);
listener.sessionCreated(event);
context.fireContainerEvent("afterSessionCreated",
listener);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
try {
- context.fireContainerEvent("afterSessionCreated",
- listener);
+ context.fireContainerEvent("afterSessionCreated",
listener);
} catch (Exception e) {
// Ignore
}
- manager.getContext().getLogger().error
- (sm.getString("standardSession.sessionEvent"), t);
+ manager.getContext().getLogger().error
(sm.getString("standardSession.sessionEvent"), t);
}
}
}
@@ -891,12 +887,10 @@ public class StandardSession implements HttpSession,
Session, Serializable {
if (event == null)
event = new HttpSessionEvent(getSession());
try {
- ((HttpSessionActivationListener) attribute)
- .sessionWillPassivate(event);
+ ((HttpSessionActivationListener)
attribute).sessionWillPassivate(event);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- manager.getContext().getLogger().error
- (sm.getString("standardSession.attributeEvent"),
t);
+
manager.getContext().getLogger().error(sm.getString("standardSession.attributeEvent"),
t);
}
}
}
@@ -927,16 +921,13 @@ public class StandardSession implements HttpSession,
Session, Serializable {
if (event == null)
event = new HttpSessionEvent(getSession());
try {
- ((HttpSessionActivationListener) attribute)
- .sessionDidActivate(event);
+ ((HttpSessionActivationListener)
attribute).sessionDidActivate(event);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- manager.getContext().getLogger().error
- (sm.getString("standardSession.attributeEvent"),
t);
+
manager.getContext().getLogger().error(sm.getString("standardSession.attributeEvent"),
t);
}
}
}
-
}
@@ -1700,8 +1691,7 @@ public class StandardSession implements HttpSession,
Session, Serializable {
Object value = attributes.get(key);
if (value == null) {
continue;
- }
- else if (isAttributeDistributable(key, value) && !exclude(key,
value)) {
+ } else if (isAttributeDistributable(key, value) && !exclude(key,
value)) {
saveNames.add(key);
saveValues.add(value);
} else {
@@ -1853,30 +1843,25 @@ public class StandardSession implements HttpSession,
Session, Serializable {
if (listeners == null)
return;
for (Object o : listeners) {
- if (!(o instanceof HttpSessionAttributeListener))
+ if (!(o instanceof HttpSessionAttributeListener)) {
continue;
- HttpSessionAttributeListener listener =
- (HttpSessionAttributeListener) o;
+ }
+ HttpSessionAttributeListener listener =
(HttpSessionAttributeListener) o;
try {
- context.fireContainerEvent("beforeSessionAttributeRemoved",
- listener);
+ context.fireContainerEvent("beforeSessionAttributeRemoved",
listener);
if (event == null) {
- event = new HttpSessionBindingEvent
- (getSession(), name, value);
+ event = new HttpSessionBindingEvent(getSession(), name,
value);
}
listener.attributeRemoved(event);
- context.fireContainerEvent("afterSessionAttributeRemoved",
- listener);
+ context.fireContainerEvent("afterSessionAttributeRemoved",
listener);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
try {
- context.fireContainerEvent("afterSessionAttributeRemoved",
- listener);
+ context.fireContainerEvent("afterSessionAttributeRemoved",
listener);
} catch (Exception e) {
// Ignore
}
- manager.getContext().getLogger().error
- (sm.getString("standardSession.attributeEvent"), t);
+
manager.getContext().getLogger().error(sm.getString("standardSession.attributeEvent"),
t);
}
}
diff --git a/java/org/apache/catalina/startup/Catalina.java
b/java/org/apache/catalina/startup/Catalina.java
index 099d305..5df6701 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -232,24 +232,18 @@ public class Catalina {
if (isConfig) {
configFile = arg;
isConfig = false;
- }
- else if (arg.equals("-config")) {
+ } else if (arg.equals("-config")) {
isConfig = true;
- }
- else if (arg.equals("-nonaming")) {
+ } else if (arg.equals("-nonaming")) {
setUseNaming(false);
- }
- else if (arg.equals("-help")) {
+ } else if (arg.equals("-help")) {
usage();
return false;
- }
- else if (arg.equals("start")) {
+ } else if (arg.equals("start")) {
// NOOP
- }
- else if (arg.equals("configtest")) {
+ } else if (arg.equals("configtest")) {
// NOOP
- }
- else if (arg.equals("stop")) {
+ } else if (arg.equals("stop")) {
// NOOP
} else {
usage();
diff --git a/java/org/apache/catalina/startup/ClassLoaderFactory.java
b/java/org/apache/catalina/startup/ClassLoaderFactory.java
index 7a35dd6..2be5613 100644
--- a/java/org/apache/catalina/startup/ClassLoaderFactory.java
+++ b/java/org/apache/catalina/startup/ClassLoaderFactory.java
@@ -85,14 +85,15 @@ public final class ClassLoaderFactory {
// Add unpacked directories
if (unpacked != null) {
- for (File value : unpacked) {
- File file = value;
- if (!file.canRead())
+ for (File file : unpacked) {
+ if (!file.canRead()) {
continue;
+ }
file = new File(file.getCanonicalPath() + File.separator);
URL url = file.toURI().toURL();
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(" Including directory " + url);
+ }
set.add(url);
}
}
@@ -100,19 +101,22 @@ public final class ClassLoaderFactory {
// Add packed directory JAR files
if (packed != null) {
for (File directory : packed) {
- if (!directory.isDirectory() || !directory.canRead())
+ if (!directory.isDirectory() || !directory.canRead()) {
continue;
+ }
String filenames[] = directory.list();
if (filenames == null) {
continue;
}
for (String s : filenames) {
String filename = s.toLowerCase(Locale.ENGLISH);
- if (!filename.endsWith(".jar"))
+ if (!filename.endsWith(".jar")) {
continue;
+ }
File file = new File(directory, s);
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(" Including jar file " +
file.getAbsolutePath());
+ }
URL url = file.toURI().toURL();
set.add(url);
}
@@ -125,10 +129,11 @@ public final class ClassLoaderFactory {
new PrivilegedAction<URLClassLoader>() {
@Override
public URLClassLoader run() {
- if (parent == null)
+ if (parent == null) {
return new URLClassLoader(array);
- else
+ } else {
return new URLClassLoader(array, parent);
+ }
}
});
}
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
b/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
index f243514..872f66a 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
@@ -208,7 +208,9 @@ public class FragmentationInterceptor extends
ChannelInterceptorBase implements
public ChannelMessage assemble() {
if ( !complete() ) throw new
IllegalStateException(sm.getString("fragmentationInterceptor.fragments.missing"));
int buffersize = 0;
- for (XByteBuffer xByteBuffer : frags) buffersize +=
xByteBuffer.getLength();
+ for (XByteBuffer frag : frags) {
+ buffersize += frag.getLength();
+ }
XByteBuffer buf = new XByteBuffer(buffersize,false);
msg.setMessage(buf);
for (XByteBuffer frag : frags) {
diff --git
a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
index b8846f3..7664afa 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
@@ -196,24 +196,15 @@ public class NioReplicationTask extends AbstractRxTask {
registerForRead(key,reader);//register to read new data, before we
send it off to avoid dead locks
- /**
- * Use send ack here if you want to ack the request to the remote
- * server before completing the request
- * This is considered an asynchronous request
- */
- /**
- * Use send ack here if you want the request to complete on this
- * server before sending the ack to the remote server
- * This is considered a synchronized request
- */
for (ChannelMessage msg : msgs) {
/**
* Use send ack here if you want to ack the request to the remote
* server before completing the request
* This is considered an asynchronous request
*/
- if (ChannelData.sendAckAsync(msg.getOptions()))
+ if (ChannelData.sendAckAsync(msg.getOptions())) {
sendAck(key, (WritableByteChannel) channel,
Constants.ACK_COMMAND, saddr);
+ }
try {
if (Logs.MESSAGES.isTraceEnabled()) {
try {
diff --git a/java/org/apache/catalina/util/ExtensionValidator.java
b/java/org/apache/catalina/util/ExtensionValidator.java
index 0c7fc13..e308a5e 100644
--- a/java/org/apache/catalina/util/ExtensionValidator.java
+++ b/java/org/apache/catalina/util/ExtensionValidator.java
@@ -345,14 +345,11 @@ public final class ExtensionValidator {
continue;
}
for (File file : files) {
- if
(file.getName().toLowerCase(Locale.ENGLISH).endsWith(".jar") &&
- file.isFile()) {
+ if
(file.getName().toLowerCase(Locale.ENGLISH).endsWith(".jar") && file.isFile()) {
try {
addSystemResource(file);
} catch (IOException e) {
- log.error
- (sm.getString
- ("extensionValidator.failload",
file), e);
+
log.error(sm.getString("extensionValidator.failload", file), e);
}
}
}
@@ -360,6 +357,4 @@ public final class ExtensionValidator {
}
}
-
-
}
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index 2580524..83f9c93 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -1517,9 +1517,9 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
public void addElement(CharArrayWriter buf, Date date, Request request,
Response response, long time) {
String value = "-";
- Cookie[] c = request.getCookies();
- if (c != null) {
- for (Cookie cookie : c) {
+ Cookie[] cookies = request.getCookies();
+ if (cookies != null) {
+ for (Cookie cookie : cookies) {
if (header.equals(cookie.getName())) {
value = cookie.getValue();
break;
diff --git a/java/org/apache/el/util/ReflectionUtil.java
b/java/org/apache/el/util/ReflectionUtil.java
index 60f1dcb..da935ec 100644
--- a/java/org/apache/el/util/ReflectionUtil.java
+++ b/java/org/apache/el/util/ReflectionUtil.java
@@ -436,11 +436,11 @@ public class ReflectionUtil {
(jreCompat.canAcccess(base, m) || base != null &&
jreCompat.canAcccess(null, m)))) {
return m;
}
- Class<?>[] inf = type.getInterfaces();
+ Class<?>[] interfaces = type.getInterfaces();
Method mp = null;
- for (Class<?> aClass : inf) {
+ for (Class<?> iface : interfaces) {
try {
- mp = aClass.getMethod(m.getName(), m.getParameterTypes());
+ mp = iface.getMethod(m.getName(), m.getParameterTypes());
mp = getMethod(mp.getDeclaringClass(), base, mp);
if (mp != null) {
return mp;
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index b5acd0b..7ef04e0 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -1726,13 +1726,13 @@ public class JspC extends Task implements Options {
// therefore we have permission to freak out
throw new RuntimeException(ioe.toString());
}
- File lib = new File(webappBase, "/WEB-INF/lib");
- if (lib.exists() && lib.isDirectory()) {
- String[] libs = lib.list();
+ File webinfLib = new File(webappBase, "/WEB-INF/lib");
+ if (webinfLib.exists() && webinfLib.isDirectory()) {
+ String[] libs = webinfLib.list();
if (libs != null) {
- for (String s : libs) {
- if (s.length() < 5) continue;
- String ext = s.substring(s.length() - 4);
+ for (String lib : libs) {
+ if (lib.length() < 5) continue;
+ String ext = lib.substring(lib.length() - 4);
if (!".jar".equalsIgnoreCase(ext)) {
if (".tld".equalsIgnoreCase(ext)) {
log.warn("TLD files should not be placed in "
@@ -1741,9 +1741,8 @@ public class JspC extends Task implements Options {
continue;
}
try {
- File libFile = new File(lib, s);
- classPath = classPath + File.pathSeparator
- + libFile.getAbsolutePath();
+ File libFile = new File(webinfLib, lib);
+ classPath = classPath + File.pathSeparator +
libFile.getAbsolutePath();
urls.add(libFile.getAbsoluteFile().toURI().toURL());
} catch (IOException ioe) {
// failing a toCanonicalPath on a file that
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index ea58146..fcfb517 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2731,8 +2731,7 @@ class Generator {
if (varName == null) {
varName = n.getTagData().getAttributeString(
tagVarInfo.getNameFromAttribute());
- }
- else if (tagVarInfo.getNameFromAttribute() !=
null) {
+ } else if (tagVarInfo.getNameFromAttribute() !=
null) {
// alias
continue;
}
@@ -2804,8 +2803,7 @@ class Generator {
if (varName == null) {
varName = n.getTagData().getAttributeString(
tagVarInfo.getNameFromAttribute());
- }
- else if (tagVarInfo.getNameFromAttribute() != null) {
+ } else if (tagVarInfo.getNameFromAttribute() != null) {
// alias
continue;
}
@@ -2875,8 +2873,7 @@ class Generator {
if (varName == null) {
varName = n.getTagData().getAttributeString(
tagVarInfo.getNameFromAttribute());
- }
- else if (tagVarInfo.getNameFromAttribute() != null) {
+ } else if (tagVarInfo.getNameFromAttribute() != null) {
// alias
continue;
}
@@ -2929,8 +2926,7 @@ class Generator {
if (name == null) {
name = n.getTagData().getAttributeString(
tagVarInfo.getNameFromAttribute());
- }
- else if (tagVarInfo.getNameFromAttribute() != null) {
+ } else if (tagVarInfo.getNameFromAttribute() != null) {
// alias
continue;
}
diff --git a/java/org/apache/jasper/compiler/JspUtil.java
b/java/org/apache/jasper/compiler/JspUtil.java
index c1f5ec0..b077113 100644
--- a/java/org/apache/jasper/compiler/JspUtil.java
+++ b/java/org/apache/jasper/compiler/JspUtil.java
@@ -165,16 +165,16 @@ public class JspUtil {
*/
String missingAttribute = null;
- for (ValidAttribute value : validAttributes) {
+ for (ValidAttribute validAttribute : validAttributes) {
int attrPos;
- if (value.mandatory) {
- attrPos = temp.indexOf(value.name);
+ if (validAttribute.mandatory) {
+ attrPos = temp.indexOf(validAttribute.name);
if (attrPos != -1) {
temp.remove(attrPos);
valid = true;
} else {
valid = false;
- missingAttribute = value.name;
+ missingAttribute = validAttribute.name;
break;
}
}
diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java
b/java/org/apache/jasper/servlet/JspCServletContext.java
index fa24ce5..7298708 100644
--- a/java/org/apache/jasper/servlet/JspCServletContext.java
+++ b/java/org/apache/jasper/servlet/JspCServletContext.java
@@ -451,8 +451,7 @@ public class JspCServletContext implements ServletContext {
File testFile = new File(basePath + File.separator +
theFile);
if (testFile.isFile()) {
thePaths.add(path + theFile);
- }
- else if (testFile.isDirectory()) {
+ } else if (testFile.isDirectory()) {
thePaths.add(path + theFile + "/");
}
}
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
index 11290c6..c215d03 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingConnection.java
@@ -626,8 +626,7 @@ public class DelegatingConnection<C extends Connection>
extends AbandonedTrace i
} catch (Exception e) {
thrownList.add(e);
}
- }
- else if (trace instanceof ResultSet) {
+ } else if (trace instanceof ResultSet) {
// DBCP-265: Need to close the result sets that are
// generated via DatabaseMetaData
try {
diff --git a/java/org/apache/tomcat/util/IntrospectionUtils.java
b/java/org/apache/tomcat/util/IntrospectionUtils.java
index 506f50d..606d648 100644
--- a/java/org/apache/tomcat/util/IntrospectionUtils.java
+++ b/java/org/apache/tomcat/util/IntrospectionUtils.java
@@ -90,8 +90,7 @@ public final class IntrospectionUtils {
ok = false;
}
// Try a setFoo ( long )
- }
- else if ("java.lang.Long".equals(paramType.getName())
+ } else if ("java.lang.Long".equals(paramType.getName())
|| "long".equals(paramType.getName())) {
try {
params[0] = Long.valueOf(value);
@@ -100,14 +99,12 @@ public final class IntrospectionUtils {
}
// Try a setFoo ( boolean )
- }
- else if ("java.lang.Boolean".equals(paramType.getName())
+ } else if ("java.lang.Boolean".equals(paramType.getName())
|| "boolean".equals(paramType.getName())) {
params[0] = Boolean.valueOf(value);
// Try a setFoo ( InetAddress )
- }
- else if ("java.net.InetAddress".equals(paramType
+ } else if ("java.net.InetAddress".equals(paramType
.getName())) {
try {
params[0] = InetAddress.getByName(value);
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java
b/java/org/apache/tomcat/util/buf/ByteChunk.java
index d761054..d3ec97c 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -803,7 +803,6 @@ public final class ByteChunk extends AbstractChunk {
* is not found.
*/
public static int findBytes(byte bytes[], int start, int end, byte b[]) {
- int blen = b.length;
int offset = start;
while (offset < end) {
for (byte value : b) {
diff --git a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
index 3dbf9f6..db66c5f 100644
--- a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
+++ b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
@@ -21,7 +21,6 @@ package org.apache.tomcat.util.modeler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Iterator;
import javax.management.Attribute;
import javax.management.AttributeChangeNotification;
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
index ad00ff7..72809e7 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
@@ -225,8 +225,7 @@ public class MbeansDescriptorsIntrospectionSource extends
ModelerSource
getAttMap.put(name, method);
// just a marker, we don't use the value
attMap.put(name, method);
- }
- else if (name.startsWith("is") && params.length == 0) {
+ } else if (name.startsWith("is") && params.length == 0) {
Class<?> ret = method.getReturnType();
if (Boolean.TYPE != ret) {
if (log.isDebugEnabled()) {
@@ -240,8 +239,7 @@ public class MbeansDescriptorsIntrospectionSource extends
ModelerSource
// just a marker, we don't use the value
attMap.put(name, method);
- }
- else if (name.startsWith("set") && params.length == 1) {
+ } else if (name.startsWith("set") && params.length == 1) {
if (!supportedType(params[0])) {
if (log.isDebugEnabled()) {
log.debug("Unsupported type " + method + " " +
params[0]);
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
index 9f2d1ca..8ab720c 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLConf.java
@@ -70,8 +70,7 @@ public class OpenSSLConf implements Serializable {
log.error(sm.getString("opensslconf.failedCommand", name,
value,
Integer.toString(rc)));
result = false;
- }
- else if (log.isDebugEnabled()) {
+ } else if (log.isDebugEnabled()) {
log.debug(sm.getString("opensslconf.resultCommand", name,
value,
Integer.toString(rc)));
}
@@ -111,8 +110,7 @@ public class OpenSSLConf implements Serializable {
log.error(sm.getString("opensslconf.failedCommand", name,
value,
Integer.toString(rc)));
result = false;
- }
- else if (log.isDebugEnabled()) {
+ } else if (log.isDebugEnabled()) {
log.debug(sm.getString("opensslconf.resultCommand", name,
value,
Integer.toString(rc)));
}
diff --git a/java/org/apache/tomcat/websocket/AuthenticatorFactory.java
b/java/org/apache/tomcat/websocket/AuthenticatorFactory.java
index 116ab67..0bc5e6b 100644
--- a/java/org/apache/tomcat/websocket/AuthenticatorFactory.java
+++ b/java/org/apache/tomcat/websocket/AuthenticatorFactory.java
@@ -16,7 +16,6 @@
*/
package org.apache.tomcat.websocket;
-import java.util.Iterator;
import java.util.ServiceLoader;
/**
diff --git
a/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
b/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
index fb7c960..8d8dba1 100644
--- a/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
+++ b/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
@@ -64,8 +64,8 @@ public class TestGroupChannelMemberArrival {
};
threads[i] = t;
}
- for (Thread value : threads) {
- value.start();
+ for (Thread thread : threads) {
+ thread.start();
}
for (Thread thread : threads) {
thread.join();
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
b/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
index e03ddec..bd2be3c 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
@@ -73,7 +73,7 @@ public class TestDomainFilterInterceptor {
};
threads[i] = t;
}
- for (Thread value : threads) value.start();
+ for (Thread thread : threads) thread.start();
for (Thread thread : threads) thread.join();
System.out.println("All channels started.");
for (int i=listeners.length-1; i>=0; i-- ) {
diff --git
a/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
b/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
index c2e76a1..bfd707b 100644
---
a/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
+++
b/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
@@ -118,8 +118,8 @@ public class TestOrderInterceptor {
for (int i=0;i<threads.length;i++) {
threads[i] = new Thread(run);
}
- for (Thread item : threads) {
- item.start();
+ for (Thread thread : threads) {
+ thread.start();
}
for (Thread thread : threads) {
thread.join();
diff --git
a/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
b/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
index 30675d8..af192dc 100644
--- a/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
+++ b/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
@@ -78,8 +78,8 @@ public class TestDataIntegrity {
}
};
}
- for (Thread value : threads) {
- value.start();
+ for (Thread thread : threads) {
+ thread.start();
}
for (Thread thread : threads) {
thread.join();
@@ -93,34 +93,34 @@ public class TestDataIntegrity {
@Test
public void testDataSendASYNCM() throws Exception {
- System.err.println("Starting ASYNC MULTI THREAD");
- Thread[] threads = new Thread[threadCount];
- for (int x=0; x<threads.length; x++ ) {
- threads[x] = new Thread() {
- @Override
- public void run() {
- try {
- long start = System.currentTimeMillis();
- for (int i = 0; i < msgCount; i++)
channel1.send(new Member[] {channel2.getLocalMember(false)},
Data.createRandomData(),Channel.SEND_OPTIONS_ASYNCHRONOUS);
- System.out.println("Thread["+this.getName()+"]
sent "+msgCount+" messages in "+(System.currentTimeMillis()-start)+" ms.");
- }catch ( Exception x ) {
- x.printStackTrace();
- return;
- }
+ System.err.println("Starting ASYNC MULTI THREAD");
+ Thread[] threads = new Thread[threadCount];
+ for (int x=0; x<threads.length; x++ ) {
+ threads[x] = new Thread() {
+ @Override
+ public void run() {
+ try {
+ long start = System.currentTimeMillis();
+ for (int i = 0; i < msgCount; i++) channel1.send(new
Member[] {channel2.getLocalMember(false)},
Data.createRandomData(),Channel.SEND_OPTIONS_ASYNCHRONOUS);
+ System.out.println("Thread["+this.getName()+"] sent
"+msgCount+" messages in "+(System.currentTimeMillis()-start)+" ms.");
+ }catch ( Exception x ) {
+ x.printStackTrace();
+ return;
}
- };
- }
- for (Thread value : threads) {
- value.start();
+ }
+ };
+ }
+ for (Thread thread : threads) {
+ thread.start();
}
for (Thread thread : threads) {
thread.join();
}
- //sleep for 50 sec, let the other messages in
- long start = System.currentTimeMillis();
- while ( (System.currentTimeMillis()-start)<25000 &&
msgCount*threadCount!=listener1.count) Thread.sleep(500);
- System.err.println("Finished ASYNC MULTI THREAD
["+listener1.count+"]");
- Assert.assertEquals("Checking success
messages.",msgCount*threadCount,listener1.count);
+ //sleep for 50 sec, let the other messages in
+ long start = System.currentTimeMillis();
+ while ( (System.currentTimeMillis()-start)<25000 &&
msgCount*threadCount!=listener1.count) Thread.sleep(500);
+ System.err.println("Finished ASYNC MULTI THREAD
["+listener1.count+"]");
+ Assert.assertEquals("Checking success
messages.",msgCount*threadCount,listener1.count);
}
@Test
diff --git
a/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
b/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
index 58d8b3d..e52c61d 100644
--- a/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
+++ b/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java
@@ -131,8 +131,8 @@ public class TestMulticastPackages {
}
};
}
- for (Thread value : threads) {
- value.start();
+ for (Thread thread : threads) {
+ thread.start();
}
for (Thread thread : threads) {
thread.join();
diff --git a/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
b/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
index fecefab..146c97d 100644
--- a/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
+++ b/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java
@@ -123,8 +123,8 @@ public class TestUdpPackages {
}
};
}
- for (Thread value : threads) {
- value.start();
+ for (Thread thread : threads) {
+ thread.start();
}
for (Thread thread : threads) {
thread.join();
@@ -176,8 +176,8 @@ public class TestUdpPackages {
}
};
}
- for (Thread value : threads) {
- value.start();
+ for (Thread thread : threads) {
+ thread.start();
}
for (Thread thread : threads) {
thread.join();
diff --git a/webapps/examples/jsp/checkbox/checkresult.jsp
b/webapps/examples/jsp/checkbox/checkresult.jsp
index ecbbacf..4e64739 100644
--- a/webapps/examples/jsp/checkbox/checkresult.jsp
+++ b/webapps/examples/jsp/checkbox/checkresult.jsp
@@ -31,10 +31,10 @@ The checked fruits (got using request) are: <br>
if (fruits != null) {
for (String fruit : fruits) {
%>
- <li>
- <%
- out.println (util.HTMLFilter.filter(fruit));
- }
+<li>
+<%
+ out.println (util.HTMLFilter.filter(fruit));
+ }
} else out.println ("none selected");
%>
</ul>
@@ -51,11 +51,13 @@ The checked fruits (got using beans) are <br>
if (!fruits[0].equals("1")) {
for (String fruit : fruits) {
%>
- <li>
- <%
- out.println (util.HTMLFilter.filter(fruit));
- }
- } else out.println ("none selected");
+<li>
+<%
+ out.println (util.HTMLFilter.filter(fruit));
+ }
+ } else {
+ out.println ("none selected");
+ }
%>
</ul>
</font>
diff --git a/webapps/examples/jsp/sessions/carts.jsp
b/webapps/examples/jsp/sessions/carts.jsp
index b5dc606..dc51495 100644
--- a/webapps/examples/jsp/sessions/carts.jsp
+++ b/webapps/examples/jsp/sessions/carts.jsp
@@ -30,8 +30,8 @@
String[] items = cart.getItems();
for (String item : items) {
%>
- <li> <% out.print(util.HTMLFilter.filter(item)); %>
- <%
+<li> <% out.print(util.HTMLFilter.filter(item)); %>
+<%
}
%>
</ol>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
