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 69bf01a2ac242afb844a5b9cfe4903cfef0011fb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 26 23:43:42 2021 +0100
Code clean-up. Fix remaining braces.
---
java/javax/servlet/http/HttpServlet.java | 72 +++++++++++++++-------
.../catalina/core/ApplicationHttpRequest.java | 2 +
java/org/apache/catalina/core/ContainerBase.java | 9 ++-
java/org/apache/catalina/core/StandardContext.java | 18 ++++--
java/org/apache/catalina/core/StandardService.java | 3 +-
.../core/ThreadLocalLeakPreventionListener.java | 6 +-
.../apache/catalina/ha/session/DeltaSession.java | 8 ++-
.../apache/catalina/manager/StatusTransformer.java | 6 +-
.../mbeans/JmxRemoteLifecycleListener.java | 15 +++--
.../catalina/realm/JAASMemoryLoginModule.java | 3 +-
java/org/apache/catalina/realm/JDBCRealm.java | 30 ++++++---
java/org/apache/catalina/session/JDBCStore.java | 30 ++++++---
.../catalina/startup/SetAllPropertiesRule.java | 6 +-
.../storeconfig/ConnectorStoreAppender.java | 3 +-
.../storeconfig/GlobalNamingResourcesSF.java | 9 ++-
.../catalina/storeconfig/NamingResourcesSF.java | 3 +-
.../apache/catalina/storeconfig/StoreConfig.java | 21 ++++---
.../storeconfig/StoreConfigLifecycleListener.java | 5 +-
.../apache/catalina/storeconfig/StoreLoader.java | 18 ++++--
.../apache/catalina/storeconfig/StoreRegistry.java | 25 +++++---
.../catalina/storeconfig/WatchedResourceSF.java | 3 +-
.../catalina/storeconfig/WrapperLifecycleSF.java | 3 +-
.../catalina/storeconfig/WrapperListenerSF.java | 3 +-
.../catalina/tribes/io/BufferPool15Impl.java | 11 +++-
.../catalina/tribes/membership/McastService.java | 18 ++++--
.../catalina/tribes/membership/MemberImpl.java | 10 +--
.../catalina/tribes/transport/bio/BioReceiver.java | 34 +++++++---
.../tribes/transport/bio/BioReplicationTask.java | 24 ++++++--
.../catalina/tribes/transport/bio/BioSender.java | 55 ++++++++++++-----
.../tribes/transport/bio/MultipointBioSender.java | 35 ++++++++---
.../tribes/transport/bio/PooledMultiSender.java | 7 ++-
.../catalina/tribes/util/ExecutorFactory.java | 4 +-
.../catalina/valves/rewrite/RewriteValve.java | 6 +-
java/org/apache/coyote/RequestInfo.java | 3 +-
.../apache/coyote/http11/Http11InputBuffer.java | 8 ++-
.../http11/filters/SavedRequestInputFilter.java | 3 +-
java/org/apache/el/lang/ELSupport.java | 3 +-
java/org/apache/jasper/compiler/SmapGenerator.java | 6 +-
java/org/apache/jasper/el/JspValueExpression.java | 36 ++++++++---
.../apache/jasper/runtime/JspContextWrapper.java | 3 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 5 +-
java/org/apache/jasper/security/SecurityUtil.java | 3 +-
java/org/apache/jasper/xmlparser/UCSReader.java | 46 +++++++++-----
java/org/apache/jasper/xmlparser/UTF8Reader.java | 6 +-
.../jasper/xmlparser/XMLEncodingDetector.java | 8 ++-
.../apache/jasper/xmlparser/XMLStringBuffer.java | 6 +-
.../util/descriptor/web/SecurityConstraint.java | 9 ++-
.../util/modeler/BaseNotificationBroadcaster.java | 3 +-
.../tomcat/util/net/NioBlockingSelector.java | 72 ++++++++++++++++------
java/org/apache/tomcat/util/net/NioChannel.java | 4 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 42 +++++++++----
.../apache/tomcat/util/net/NioSelectorPool.java | 15 ++++-
.../apache/tomcat/util/net/SecureNioChannel.java | 31 +++++++---
.../tomcat/util/scan/StandardJarScanner.java | 6 +-
.../tomcat/jdbc/pool/jmx/ConnectionPool.java | 28 ++++++---
.../WEB-INF/classes/filters/ExampleFilter.java | 3 +-
56 files changed, 600 insertions(+), 254 deletions(-)
diff --git a/java/javax/servlet/http/HttpServlet.java
b/java/javax/servlet/http/HttpServlet.java
index 7cc00bc..49d77e8 100644
--- a/java/javax/servlet/http/HttpServlet.java
+++ b/java/javax/servlet/http/HttpServlet.java
@@ -501,35 +501,63 @@ public abstract class HttpServlet extends GenericServlet {
ALLOW_GET = true;
ALLOW_HEAD = true;
}
- if (m.getName().equals("doPost"))
+ if (m.getName().equals("doPost")) {
ALLOW_POST = true;
- if (m.getName().equals("doPut"))
+ }
+ if (m.getName().equals("doPut")) {
ALLOW_PUT = true;
- if (m.getName().equals("doDelete"))
+ }
+ if (m.getName().equals("doDelete")) {
ALLOW_DELETE = true;
+ }
}
String allow = null;
- if (ALLOW_GET)
+ if (ALLOW_GET) {
allow=METHOD_GET;
- if (ALLOW_HEAD)
- if (allow==null) allow=METHOD_HEAD;
- else allow += ", " + METHOD_HEAD;
- if (ALLOW_POST)
- if (allow==null) allow=METHOD_POST;
- else allow += ", " + METHOD_POST;
- if (ALLOW_PUT)
- if (allow==null) allow=METHOD_PUT;
- else allow += ", " + METHOD_PUT;
- if (ALLOW_DELETE)
- if (allow==null) allow=METHOD_DELETE;
- else allow += ", " + METHOD_DELETE;
- if (ALLOW_TRACE)
- if (allow==null) allow=METHOD_TRACE;
- else allow += ", " + METHOD_TRACE;
- if (ALLOW_OPTIONS)
- if (allow==null) allow=METHOD_OPTIONS;
- else allow += ", " + METHOD_OPTIONS;
+ }
+ if (ALLOW_HEAD) {
+ if (allow==null) {
+ allow=METHOD_HEAD;
+ } else {
+ allow += ", " + METHOD_HEAD;
+ }
+ }
+ if (ALLOW_POST) {
+ if (allow==null) {
+ allow=METHOD_POST;
+ } else {
+ allow += ", " + METHOD_POST;
+ }
+ }
+ if (ALLOW_PUT) {
+ if (allow==null) {
+ allow=METHOD_PUT;
+ } else {
+ allow += ", " + METHOD_PUT;
+ }
+ }
+ if (ALLOW_DELETE) {
+ if (allow==null) {
+ allow=METHOD_DELETE;
+ } else {
+ allow += ", " + METHOD_DELETE;
+ }
+ }
+ if (ALLOW_TRACE) {
+ if (allow==null) {
+ allow=METHOD_TRACE;
+ } else {
+ allow += ", " + METHOD_TRACE;
+ }
+ }
+ if (ALLOW_OPTIONS) {
+ if (allow==null) {
+ allow=METHOD_OPTIONS;
+ } else {
+ allow += ", " + METHOD_OPTIONS;
+ }
+ }
resp.setHeader("Allow", allow);
}
diff --git a/java/org/apache/catalina/core/ApplicationHttpRequest.java
b/java/org/apache/catalina/core/ApplicationHttpRequest.java
index 7c8d7ef..178641e 100644
--- a/java/org/apache/catalina/core/ApplicationHttpRequest.java
+++ b/java/org/apache/catalina/core/ApplicationHttpRequest.java
@@ -503,7 +503,9 @@ class ApplicationHttpRequest extends
HttpServletRequestWrapper {
String scheme = getScheme();
int port = getServerPort();
if (port < 0)
+ {
port = 80; // Work around java.net.URL bug
+ }
url.append(scheme);
url.append("://");
diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index 45a3ea8..d4f3aa0 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -1290,10 +1290,12 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
*/
protected void threadStart() {
- if (thread != null)
+ if (thread != null) {
return;
- if (backgroundProcessorDelay <= 0)
+ }
+ if (backgroundProcessorDelay <= 0) {
return;
+ }
threadDone = false;
String threadName = "ContainerBackgroundProcessor[" + toString() + "]";
@@ -1310,8 +1312,9 @@ public abstract class ContainerBase extends
LifecycleMBeanBase
*/
protected void threadStop() {
- if (thread == null)
+ if (thread == null) {
return;
+ }
threadDone = true;
thread.interrupt();
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 019e6bc..4676b7c 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2922,8 +2922,9 @@ public class StandardContext extends ContainerBase
synchronized (constraintsLock) {
SecurityConstraint results[] =
new SecurityConstraint[constraints.length + 1];
- for (int i = 0; i < constraints.length; i++)
+ for (int i = 0; i < constraints.length; i++) {
results[i] = constraints[i];
+ }
results[constraints.length] = constraint;
constraints = results;
}
@@ -3165,8 +3166,9 @@ public class StandardContext extends ContainerBase
synchronized (securityRolesLock) {
String results[] =new String[securityRoles.length + 1];
- for (int i = 0; i < securityRoles.length; i++)
+ for (int i = 0; i < securityRoles.length; i++) {
results[i] = securityRoles[i];
+ }
results[securityRoles.length] = role;
securityRoles = results;
}
@@ -3236,8 +3238,9 @@ public class StandardContext extends ContainerBase
synchronized (watchedResourcesLock) {
String results[] = new String[watchedResources.length + 1];
- for (int i = 0; i < watchedResources.length; i++)
+ for (int i = 0; i < watchedResources.length; i++) {
results[i] = watchedResources[i];
+ }
results[watchedResources.length] = name;
watchedResources = results;
}
@@ -3262,8 +3265,9 @@ public class StandardContext extends ContainerBase
setReplaceWelcomeFiles(false);
}
String results[] =new String[welcomeFiles.length + 1];
- for (int i = 0; i < welcomeFiles.length; i++)
+ for (int i = 0; i < welcomeFiles.length; i++) {
results[i] = welcomeFiles[i];
+ }
results[welcomeFiles.length] = name;
welcomeFiles = results;
}
@@ -3284,8 +3288,9 @@ public class StandardContext extends ContainerBase
synchronized (wrapperLifecyclesLock) {
String results[] =new String[wrapperLifecycles.length + 1];
- for (int i = 0; i < wrapperLifecycles.length; i++)
+ for (int i = 0; i < wrapperLifecycles.length; i++) {
results[i] = wrapperLifecycles[i];
+ }
results[wrapperLifecycles.length] = listener;
wrapperLifecycles = results;
}
@@ -3305,8 +3310,9 @@ public class StandardContext extends ContainerBase
synchronized (wrapperListenersLock) {
String results[] =new String[wrapperListeners.length + 1];
- for (int i = 0; i < wrapperListeners.length; i++)
+ for (int i = 0; i < wrapperListeners.length; i++) {
results[i] = wrapperListeners[i];
+ }
results[wrapperListeners.length] = listener;
wrapperListeners = results;
}
diff --git a/java/org/apache/catalina/core/StandardService.java
b/java/org/apache/catalina/core/StandardService.java
index 3df6d43..c466766 100644
--- a/java/org/apache/catalina/core/StandardService.java
+++ b/java/org/apache/catalina/core/StandardService.java
@@ -560,8 +560,9 @@ public class StandardService extends LifecycleMBeanBase
implements Service {
"standardService.connector.initFailed", connector);
log.error(message, e);
- if
(Boolean.getBoolean("org.apache.catalina.startup.EXIT_ON_INIT_FAILURE"))
+ if
(Boolean.getBoolean("org.apache.catalina.startup.EXIT_ON_INIT_FAILURE")) {
throw new LifecycleException(message);
+ }
}
}
}
diff --git
a/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
b/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
index 4532d70..8ecd916 100644
--- a/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
+++ b/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
@@ -156,9 +156,10 @@ public class ThreadLocalLeakPreventionListener implements
LifecycleListener,
}
protected void processContainerAddChild(Container parent, Container child)
{
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Process addChild[parent=" + parent + ",child=" + child +
"]");
+ }
if (child instanceof Context) {
registerContextListener((Context) child);
@@ -173,9 +174,10 @@ public class ThreadLocalLeakPreventionListener implements
LifecycleListener,
protected void processContainerRemoveChild(Container parent,
Container child) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Process removeChild[parent=" + parent + ",child=" +
child + "]");
+ }
if (child instanceof Context) {
Context context = (Context) child;
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 58d665c..efc31a7 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -1039,7 +1039,11 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
}
protected void setAccessCount(int count) {
- if ( accessCount == null && ACTIVITY_CHECK ) accessCount = new
AtomicInteger();
- if ( accessCount != null ) super.accessCount.set(count);
+ if ( accessCount == null && ACTIVITY_CHECK ) {
+ accessCount = new AtomicInteger();
+ }
+ if ( accessCount != null ) {
+ super.accessCount.set(count);
+ }
}
}
diff --git a/java/org/apache/catalina/manager/StatusTransformer.java
b/java/org/apache/catalina/manager/StatusTransformer.java
index c1e42e1..f04f083 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -955,8 +955,9 @@ public class StatusTransformer {
@Deprecated
public static String filter(Object obj) {
- if (obj == null)
+ if (obj == null) {
return ("?");
+ }
String message = obj.toString();
char content[] = new char[message.length()];
@@ -994,8 +995,9 @@ public class StatusTransformer {
*/
@Deprecated
public static String filterXml(String s) {
- if (s == null)
+ if (s == null) {
return "";
+ }
StringBuilder sb = new StringBuilder();
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
diff --git a/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
b/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
index b5e2afe..b38624c 100644
--- a/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
@@ -490,18 +490,23 @@ public class JmxRemoteLifecycleListener implements
LifecycleListener {
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj) {
return true;
- if (!super.equals(obj))
+ }
+ if (!super.equals(obj)) {
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
+ }
SslRmiServerBindSocketFactory other =
(SslRmiServerBindSocketFactory) obj;
if (bindAddress == null) {
- if (other.bindAddress != null)
+ if (other.bindAddress != null) {
return false;
- } else if (!bindAddress.equals(other.bindAddress))
+ }
+ } else if (!bindAddress.equals(other.bindAddress)) {
return false;
+ }
return true;
}
}
diff --git a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
index 8dc4fa4..dea1e1a 100644
--- a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
+++ b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
@@ -285,8 +285,9 @@ public class JAASMemoryLoginModule extends MemoryRealm
implements LoginModule {
@Override
public boolean login() throws LoginException {
// Set up our CallbackHandler requests
- if (callbackHandler == null)
+ if (callbackHandler == null) {
throw new LoginException("No CallbackHandler specified");
+ }
Callback callbacks[] = new Callback[9];
callbacks[0] = new NameCallback("Username: ");
callbacks[1] = new PasswordCallback("Password: ", false);
diff --git a/java/org/apache/catalina/realm/JDBCRealm.java
b/java/org/apache/catalina/realm/JDBCRealm.java
index d32fcb1..96c7504 100644
--- a/java/org/apache/catalina/realm/JDBCRealm.java
+++ b/java/org/apache/catalina/realm/JDBCRealm.java
@@ -342,8 +342,9 @@ public class JDBCRealm
containerLog.error(sm.getString("jdbcRealm.exception"), e);
// Close the connection so that it gets reopened next time
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
}
@@ -379,9 +380,10 @@ public class JDBCRealm
// No user or no credentials
// Can't possibly authenticate, don't bother the database then
if (username == null || credentials == null) {
- if (containerLog.isTraceEnabled())
+ if (containerLog.isTraceEnabled()) {
containerLog.trace(sm.getString("jdbcRealm.authenticateFailure",
username));
+ }
return null;
}
@@ -393,9 +395,10 @@ public class JDBCRealm
// Waste a bit of time as not to reveal that the user does not
exist.
getCredentialHandler().mutate(credentials);
- if (containerLog.isTraceEnabled())
+ if (containerLog.isTraceEnabled()) {
containerLog.trace(sm.getString("jdbcRealm.authenticateFailure",
username));
+ }
return null;
}
@@ -403,13 +406,15 @@ public class JDBCRealm
boolean validated = getCredentialHandler().matches(credentials,
dbCredentials);
if (validated) {
- if (containerLog.isTraceEnabled())
+ if (containerLog.isTraceEnabled()) {
containerLog.trace(sm.getString("jdbcRealm.authenticateSuccess",
username));
+ }
} else {
- if (containerLog.isTraceEnabled())
+ if (containerLog.isTraceEnabled()) {
containerLog.trace(sm.getString("jdbcRealm.authenticateFailure",
username));
+ }
return null;
}
@@ -434,8 +439,9 @@ public class JDBCRealm
protected void close(Connection dbConnection) {
// Do nothing if the database connection is already closed
- if (dbConnection == null)
+ if (dbConnection == null) {
return;
+ }
// Close our prepared statements (if any)
try {
@@ -631,8 +637,9 @@ public class JDBCRealm
containerLog.error(sm.getString("jdbcRealm.exception"), e);
// Close the connection so that it gets reopened next time
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
}
numberOfTries--;
@@ -651,8 +658,9 @@ public class JDBCRealm
protected Connection open() throws SQLException {
// Do nothing if there is a database connection already open
- if (dbConnection != null)
+ if (dbConnection != null) {
return dbConnection;
+ }
// Instantiate our database driver if necessary
if (driver == null) {
@@ -667,10 +675,12 @@ public class JDBCRealm
// Open a new connection
Properties props = new Properties();
- if (connectionName != null)
+ if (connectionName != null) {
props.put("user", connectionName);
- if (connectionPassword != null)
+ }
+ if (connectionPassword != null) {
props.put("password", connectionPassword);
+ }
dbConnection = driver.connect(connectionURL, props);
if (dbConnection == null) {
throw new SQLException(sm.getString(
diff --git a/java/org/apache/catalina/session/JDBCStore.java
b/java/org/apache/catalina/session/JDBCStore.java
index 8a4e331..6a96a8e 100644
--- a/java/org/apache/catalina/session/JDBCStore.java
+++ b/java/org/apache/catalina/session/JDBCStore.java
@@ -542,8 +542,9 @@ public class JDBCStore extends StoreBase {
manager.getContext().getLogger().error(sm.getString(getStoreName() +
".SQLException", e));
keys = new String[0];
// Close the connection so that it gets reopened next time
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
} finally {
release(_conn);
}
@@ -593,8 +594,9 @@ public class JDBCStore extends StoreBase {
}
} catch (SQLException e) {
manager.getContext().getLogger().error(sm.getString(getStoreName() +
".SQLException", e));
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
} finally {
release(_conn);
}
@@ -661,8 +663,9 @@ public class JDBCStore extends StoreBase {
}
} catch (SQLException e) {
contextLog.error(sm.getString(getStoreName() +
".SQLException", e));
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
} finally {
context.unbind(Globals.IS_SECURITY_ENABLED,
oldThreadContextCL);
release(_conn);
@@ -701,8 +704,9 @@ public class JDBCStore extends StoreBase {
numberOfTries = 0;
} catch (SQLException e) {
manager.getContext().getLogger().error(sm.getString(getStoreName() +
".SQLException", e));
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
} finally {
release(_conn);
}
@@ -766,8 +770,9 @@ public class JDBCStore extends StoreBase {
numberOfTries = 0;
} catch (SQLException e) {
manager.getContext().getLogger().error(sm.getString(getStoreName() +
".SQLException", e));
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
} finally {
release(_conn);
}
@@ -831,8 +836,9 @@ public class JDBCStore extends StoreBase {
}
} catch (SQLException e) {
manager.getContext().getLogger().error(sm.getString(getStoreName() +
".SQLException", e));
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
} catch (IOException e) {
// Ignore
} finally {
@@ -888,8 +894,9 @@ public class JDBCStore extends StoreBase {
protected Connection open() throws SQLException {
// Do nothing if there is a database connection already open
- if (dbConnection != null)
+ if (dbConnection != null) {
return dbConnection;
+ }
if (dataSourceName != null && dataSource == null) {
org.apache.catalina.Context context = getManager().getContext();
@@ -933,10 +940,12 @@ public class JDBCStore extends StoreBase {
// Open a new connection
Properties props = new Properties();
- if (connectionName != null)
+ if (connectionName != null) {
props.put("user", connectionName);
- if (connectionPassword != null)
+ }
+ if (connectionPassword != null) {
props.put("password", connectionPassword);
+ }
dbConnection = driver.connect(connectionURL, props);
if (dbConnection == null) {
throw new SQLException(sm.getString(getStoreName() +
".connectError", connectionURL));
@@ -954,8 +963,9 @@ public class JDBCStore extends StoreBase {
protected void close(Connection dbConnection) {
// Do nothing if the database connection is already closed
- if (dbConnection == null)
+ if (dbConnection == null) {
return;
+ }
// Close our prepared statements (if any)
try {
diff --git a/java/org/apache/catalina/startup/SetAllPropertiesRule.java
b/java/org/apache/catalina/startup/SetAllPropertiesRule.java
index 5115e32..3165462 100644
--- a/java/org/apache/catalina/startup/SetAllPropertiesRule.java
+++ b/java/org/apache/catalina/startup/SetAllPropertiesRule.java
@@ -36,7 +36,11 @@ public class SetAllPropertiesRule extends Rule {
public SetAllPropertiesRule() {}
public SetAllPropertiesRule(String[] exclude) {
- for (String s : exclude) if (s != null) this.excludes.put(s, s);
+ for (String s : exclude) {
+ if (s != null) {
+ this.excludes.put(s, s);
+ }
+ }
}
// ----------------------------------------------------- Instance Variables
diff --git a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
index 586fa1e..6de623b 100644
--- a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
+++ b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
@@ -94,8 +94,9 @@ public class ConnectorStoreAppender extends StoreAppender {
printValue(writer, indent, key, value);
}
}
- if (protocol != null && !"HTTP/1.1".equals(protocol))
+ if (protocol != null && !"HTTP/1.1".equals(protocol)) {
super.printValue(writer, indent, "protocol", protocol);
+ }
}
diff --git a/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
b/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
index d863596..42f5c0a 100644
--- a/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
+++ b/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java
@@ -55,20 +55,23 @@ public class GlobalNamingResourcesSF extends
StoreFactoryBase {
resourcesdesc.getStoreFactory().store(aWriter, indent + 2,
resources);
} else {
- if(log.isWarnEnabled())
+ if(log.isWarnEnabled()) {
log.warn("Can't find NamingResources Store Factory!");
+ }
}
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printCloseTag(aWriter, elementDesc);
} else {
- if (log.isWarnEnabled())
+ if (log.isWarnEnabled()) {
log.warn("Descriptor for element" + aElement.getClass()
+ " not configured!");
+ }
}
} else {
- if (log.isWarnEnabled())
+ if (log.isWarnEnabled()) {
log.warn("wrong element " + aElement.getClass());
+ }
}
}
diff --git a/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
b/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
index 90e349e..465db01 100644
--- a/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
+++ b/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
@@ -51,9 +51,10 @@ public class NamingResourcesSF extends StoreFactoryBase {
}
storeChildren(aWriter, indent, aElement, elementDesc);
} else {
- if (log.isWarnEnabled())
+ if (log.isWarnEnabled()) {
log.warn("Descriptor for element" + aElement.getClass()
+ " not configured!");
+ }
}
}
diff --git a/java/org/apache/catalina/storeconfig/StoreConfig.java
b/java/org/apache/catalina/storeconfig/StoreConfig.java
index 39af17e..4e0044b 100644
--- a/java/org/apache/catalina/storeconfig/StoreConfig.java
+++ b/java/org/apache/catalina/storeconfig/StoreConfig.java
@@ -119,8 +119,9 @@ public class StoreConfig implements IStoreConfig {
public synchronized void storeServer(String aServerName, boolean backup,
boolean externalAllowed) throws MalformedObjectNameException {
if (aServerName == null || aServerName.length() == 0) {
- if (log.isErrorEnabled())
+ if (log.isErrorEnabled()) {
log.error("Please, call with a correct server ObjectName!");
+ }
return;
}
MBeanServer mserver = MBeanUtils.createServer();
@@ -149,12 +150,14 @@ public class StoreConfig implements IStoreConfig {
store(aServer);
}
} catch (Exception e) {
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info("Object " + aServerName
+ " is no a Server instance or store exception",
e);
+ }
}
- } else if (log.isInfoEnabled())
+ } else if (log.isInfoEnabled()) {
log.info("Server " + aServerName + " not found!");
+ }
}
/**
@@ -171,8 +174,9 @@ public class StoreConfig implements IStoreConfig {
public synchronized void storeContext(String aContextName, boolean backup,
boolean externalAllowed) throws MalformedObjectNameException {
if (aContextName == null || aContextName.length() == 0) {
- if (log.isErrorEnabled())
+ if (log.isErrorEnabled()) {
log.error("Please, call with a correct context ObjectName!");
+ }
return;
}
MBeanServer mserver = MBeanUtils.createServer();
@@ -207,20 +211,23 @@ public class StoreConfig implements IStoreConfig {
} catch (Exception e) {
log.error(e);
}
- } else
+ } else {
log.error("Missing configFile at Context "
+ aContext.getPath() + " to store!");
+ }
} catch (Exception e) {
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log
.info(
"Object "
+ aContextName
+ " is no a context instance or
store exception",
e);
+ }
}
- } else if (log.isInfoEnabled())
+ } else if (log.isInfoEnabled()) {
log.info("Context " + aContextName + " not found!");
+ }
}
/**
diff --git
a/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
b/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
index 930fc40..ad2da88 100644
--- a/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
+++ b/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
@@ -85,12 +85,13 @@ public class StoreConfigLifecycleListener implements
LifecycleListener {
Class<?> clazz = Class.forName(getStoreConfigClass(), true, this
.getClass().getClassLoader());
storeConfig = (IStoreConfig) clazz.getConstructor().newInstance();
- if (null == getStoreRegistry())
+ if (null == getStoreRegistry()) {
// default Loading
loader.load();
- else
+ } else {
// load a special file registry (url)
loader.load(getStoreRegistry());
+ }
// use the loader Registry
storeConfig.setRegistry(loader.getRegistry());
storeConfig.setServer(server);
diff --git a/java/org/apache/catalina/storeconfig/StoreLoader.java
b/java/org/apache/catalina/storeconfig/StoreLoader.java
index 5a535e1..5ad2a90 100644
--- a/java/org/apache/catalina/storeconfig/StoreLoader.java
+++ b/java/org/apache/catalina/storeconfig/StoreLoader.java
@@ -133,8 +133,9 @@ public class StoreLoader {
"addTransientChild", 0);
long t2 = System.currentTimeMillis();
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Digester for server-registry.xml created " + (t2 - t1));
+ }
return digester;
}
@@ -148,12 +149,14 @@ public class StoreLoader {
*/
protected File serverFile(String aFile) {
- if (aFile == null || aFile.length() < 1)
+ if (aFile == null || aFile.length() < 1) {
aFile = "server-registry.xml";
+ }
File file = new File(aFile);
- if (!file.isAbsolute())
+ if (!file.isAbsolute()) {
file = new File(System.getProperty("catalina.base") + "/conf",
aFile);
+ }
try {
file = file.getCanonicalFile();
} catch (IOException e) {
@@ -199,9 +202,10 @@ public class StoreLoader {
String configUrl = getConfigUrl();
if (configUrl != null) {
is = (new URL(configUrl)).openStream();
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info("Find registry server-registry.xml from system
property at url "
+ configUrl);
+ }
registryResource = new URL(configUrl);
}
} catch (Throwable t) {
@@ -213,9 +217,10 @@ public class StoreLoader {
File conf = new File(home, "conf");
File reg = new File(conf, "server-registry.xml");
is = new FileInputStream(reg);
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info("Find registry server-registry.xml at file "
+ reg.getCanonicalPath());
+ }
registryResource = reg.toURI().toURL();
} catch (Throwable t) {
// Ignore
@@ -225,8 +230,9 @@ public class StoreLoader {
try {
is = StoreLoader.class
.getResourceAsStream("/org/apache/catalina/storeconfig/server-registry.xml");
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Find registry server-registry.xml at classpath
resource");
+ }
registryResource = StoreLoader.class
.getResource("/org/apache/catalina/storeconfig/server-registry.xml");
diff --git a/java/org/apache/catalina/storeconfig/StoreRegistry.java
b/java/org/apache/catalina/storeconfig/StoreRegistry.java
index 3ffa24b..0480d16 100644
--- a/java/org/apache/catalina/storeconfig/StoreRegistry.java
+++ b/java/org/apache/catalina/storeconfig/StoreRegistry.java
@@ -108,8 +108,9 @@ public class StoreRegistry {
* @return The description
*/
public StoreDescription findDescription(String id) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("search descriptor " + id);
+ }
StoreDescription desc = descriptors.get(id);
if (desc == null) {
Class<?> aClass = null;
@@ -128,12 +129,14 @@ public class StoreRegistry {
}
}
}
- if (log.isDebugEnabled())
- if (desc != null)
+ if (log.isDebugEnabled()) {
+ if (desc != null) {
log.debug("find descriptor " + id + "#" + desc.getTag() + "#"
+ desc.getStoreFactoryClass());
- else
+ } else {
log.debug(("Can't find descriptor for key " + id));
+ }
+ }
return desc;
}
@@ -155,10 +158,11 @@ public class StoreRegistry {
*/
public IStoreFactory findStoreFactory(String aClassName) {
StoreDescription desc = findDescription(aClassName);
- if (desc != null)
+ if (desc != null) {
return desc.getStoreFactory();
- else
+ } else {
return null;
+ }
}
@@ -179,12 +183,14 @@ public class StoreRegistry {
*/
public void registerDescription(StoreDescription desc) {
String key = desc.getId();
- if (key == null || key.isEmpty())
+ if (key == null || key.isEmpty()) {
key = desc.getTagClass();
+ }
descriptors.put(key, desc);
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("register store descriptor " + key + "#" + desc.getTag()
+ "#" + desc.getTagClass());
+ }
}
/**
@@ -195,8 +201,9 @@ public class StoreRegistry {
*/
public StoreDescription unregisterDescription(StoreDescription desc) {
String key = desc.getId();
- if (key == null || "".equals(key))
+ if (key == null || "".equals(key)) {
key = desc.getTagClass();
+ }
return descriptors.remove(key);
}
diff --git a/java/org/apache/catalina/storeconfig/WatchedResourceSF.java
b/java/org/apache/catalina/storeconfig/WatchedResourceSF.java
index e0f83e2..b529ae1 100644
--- a/java/org/apache/catalina/storeconfig/WatchedResourceSF.java
+++ b/java/org/apache/catalina/storeconfig/WatchedResourceSF.java
@@ -48,8 +48,9 @@ public class WatchedResourceSF extends StoreFactoryBase {
getStoreAppender().printTagArray(aWriter, "WatchedResource",
indent, resources);
}
- } else
+ } else {
log.warn("Descriptor for element" + aElement.getClass()
+ ".[WatchedResource] not configured!");
+ }
}
}
\ No newline at end of file
diff --git a/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java
b/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java
index 150bf5e..61d8bea 100644
--- a/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java
+++ b/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java
@@ -48,8 +48,9 @@ public class WrapperLifecycleSF extends StoreFactoryBase {
getStoreAppender().printTagArray(aWriter, "WrapperLifecycle",
indent, listeners);
}
- } else
+ } else {
log.warn("Descriptor for element" + aElement.getClass()
+ ".[WrapperLifecycle] not configured!");
+ }
}
}
\ No newline at end of file
diff --git a/java/org/apache/catalina/storeconfig/WrapperListenerSF.java
b/java/org/apache/catalina/storeconfig/WrapperListenerSF.java
index 393a6a6..933fd6d 100644
--- a/java/org/apache/catalina/storeconfig/WrapperListenerSF.java
+++ b/java/org/apache/catalina/storeconfig/WrapperListenerSF.java
@@ -48,8 +48,9 @@ public class WrapperListenerSF extends StoreFactoryBase {
getStoreAppender().printTagArray(aWriter, "WrapperListener",
indent, listeners);
}
- } else
+ } else {
log.warn("Descriptor for element" + aElement.getClass()
+ ".[WrapperListener] not configured!");
+ }
}
}
\ No newline at end of file
diff --git a/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
b/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
index 57bc227..e5fa2aa 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
@@ -38,9 +38,14 @@ class BufferPool15Impl implements BufferPool.BufferPoolAPI {
@Override
public XByteBuffer getBuffer(int minSize, boolean discard) {
XByteBuffer buffer = queue.poll();
- if ( buffer != null ) size.addAndGet(-buffer.getCapacity());
- if ( buffer == null ) buffer = new XByteBuffer(minSize,discard);
- else if ( buffer.getCapacity() <= minSize ) buffer.expand(minSize);
+ if ( buffer != null ) {
+ size.addAndGet(-buffer.getCapacity());
+ }
+ if ( buffer == null ) {
+ buffer = new XByteBuffer(minSize,discard);
+ } else if ( buffer.getCapacity() <= minSize ) {
+ buffer.expand(minSize);
+ }
buffer.setDiscard(discard);
buffer.reset();
return buffer;
diff --git a/java/org/apache/catalina/tribes/membership/McastService.java
b/java/org/apache/catalina/tribes/membership/McastService.java
index 07e9e3a..9a50704 100644
--- a/java/org/apache/catalina/tribes/membership/McastService.java
+++ b/java/org/apache/catalina/tribes/membership/McastService.java
@@ -430,8 +430,9 @@ public class McastService
for (int i = 0; i < currentMembers.length; i++) {
membernames[i] = currentMembers[i].toString() ;
}
- } else
+ } else {
membernames = new String[0] ;
+ }
return membernames ;
}
@@ -442,8 +443,9 @@ public class McastService
public Member findMemberByName(String name) {
Member[] currentMembers = getMembers();
for (int i = 0; i < currentMembers.length; i++) {
- if (name.equals(currentMembers[i].toString()))
+ if (name.equals(currentMembers[i].toString())) {
return currentMembers[i];
+ }
}
return null;
}
@@ -453,13 +455,17 @@ public class McastService
*/
@Override
public boolean hasMembers() {
- if ( impl == null || impl.membership == null ) return false;
+ if ( impl == null || impl.membership == null ) {
+ return false;
+ }
return impl.membership.hasMembers();
}
@Override
public Member getMember(Member mbr) {
- if ( impl == null || impl.membership == null ) return null;
+ if ( impl == null || impl.membership == null ) {
+ return null;
+ }
return impl.membership.getMember(mbr);
}
@@ -469,7 +475,9 @@ public class McastService
protected static final Member[]EMPTY_MEMBERS = new Member[0];
@Override
public Member[] getMembers() {
- if ( impl == null || impl.membership == null ) return EMPTY_MEMBERS;
+ if ( impl == null || impl.membership == null ) {
+ return EMPTY_MEMBERS;
+ }
return impl.membership.getMembers();
}
/**
diff --git a/java/org/apache/catalina/tribes/membership/MemberImpl.java
b/java/org/apache/catalina/tribes/membership/MemberImpl.java
index 5734c3d..e102bac 100644
--- a/java/org/apache/catalina/tribes/membership/MemberImpl.java
+++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java
@@ -456,14 +456,16 @@ public class MemberImpl implements Member,
java.io.Externalizable {
}
public String getHostname() {
- if ( this.hostname != null ) return hostname;
- else {
+ if ( this.hostname != null ) {
+ return hostname;
+ } else {
try {
byte[] host = this.host;
- if (DO_DNS_LOOKUPS)
+ if (DO_DNS_LOOKUPS) {
this.hostname =
java.net.InetAddress.getByAddress(host).getHostName();
- else
+ } else {
this.hostname =
org.apache.catalina.tribes.util.Arrays.toString(host,0,host.length,true);
+ }
return this.hostname;
}catch ( IOException x ) {
throw new
RuntimeException(sm.getString("memberImpl.unableParse.hostname"),x);
diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
index 965e59c..85890fb 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
@@ -47,21 +47,29 @@ public class BioReceiver extends ReceiverBase implements
Runnable {
setPool(new RxTaskPool(getMaxThreads(),getMinThreads(),this));
} catch (Exception x) {
log.fatal(sm.getString("bioReceiver.threadpool.fail"), x);
- if ( x instanceof IOException ) throw (IOException)x;
- else throw new IOException(x.getMessage());
+ if ( x instanceof IOException ) {
+ throw (IOException)x;
+ } else {
+ throw new IOException(x.getMessage());
+ }
}
try {
getBind();
bind();
String channelName = "";
- if (getChannel().getName() != null) channelName = "[" +
getChannel().getName() + "]";
+ if (getChannel().getName() != null) {
+ channelName = "[" + getChannel().getName() + "]";
+ }
Thread t = new Thread(this, "BioReceiver" + channelName);
t.setDaemon(true);
t.start();
} catch (Exception x) {
log.fatal(sm.getString("bioReceiver.start.fail"), x);
- if ( x instanceof IOException ) throw (IOException)x;
- else throw new IOException(x.getMessage());
+ if ( x instanceof IOException ) {
+ throw (IOException)x;
+ } else {
+ throw new IOException(x.getMessage());
+ }
}
}
@@ -119,15 +127,21 @@ public class BioReceiver extends ReceiverBase implements
Runnable {
while ( doListen() ) {
Socket socket = null;
if ( getTaskPool().available() < 1 ) {
- if ( log.isWarnEnabled() )
+ if ( log.isWarnEnabled() ) {
log.warn(sm.getString("bioReceiver.threads.busy"));
+ }
}
BioReplicationTask task =
(BioReplicationTask)getTaskPool().getRxTask();
- if ( task == null ) continue; //should never happen
+ if ( task == null )
+ {
+ continue; //should never happen
+ }
try {
socket = serverSocket.accept();
}catch ( Exception x ) {
- if ( doListen() ) throw x;
+ if ( doListen() ) {
+ throw x;
+ }
}
if ( !doListen() ) {
task.setDoRun(false);
@@ -135,7 +149,9 @@ public class BioReceiver extends ReceiverBase implements
Runnable {
getExecutor().execute(task);
break; //regular shutdown
}
- if ( socket == null ) continue;
+ if ( socket == null ) {
+ continue;
+ }
socket.setReceiveBufferSize(getRxBufSize());
socket.setSendBufferSize(getTxBufSize());
socket.setTcpNoDelay(getTcpNoDelay());
diff --git
a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
index 67da1d4..401ae83 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
@@ -59,7 +59,9 @@ public class BioReplicationTask extends AbstractRxTask {
@Override
public synchronized void run()
{
- if ( socket == null ) return;
+ if ( socket == null ) {
+ return;
+ }
try {
drainSocket();
} catch ( Exception x ) {
@@ -83,7 +85,9 @@ public class BioReplicationTask extends AbstractRxTask {
socket = null;
}
// done, ready for more, return to pool
- if ( getTaskPool() != null ) getTaskPool().returnWorker (this);
+ if ( getTaskPool() != null ) {
+ getTaskPool().returnWorker (this);
+ }
}
@@ -103,7 +107,9 @@ public class BioReplicationTask extends AbstractRxTask {
* server before completing the request
* This is considered an asynchronous request
*/
- if (ChannelData.sendAckAsync(msgs[i].getOptions()))
sendAck(Constants.ACK_COMMAND);
+ if (ChannelData.sendAckAsync(msgs[i].getOptions())) {
+ sendAck(Constants.ACK_COMMAND);
+ }
try {
//process the message
getCallback().messageDataReceived(msgs[i]);
@@ -112,9 +118,13 @@ public class BioReplicationTask extends AbstractRxTask {
* server before sending the ack to the remote server
* This is considered a synchronized request
*/
- if (ChannelData.sendAckSync(msgs[i].getOptions()))
sendAck(Constants.ACK_COMMAND);
+ if (ChannelData.sendAckSync(msgs[i].getOptions())) {
+ sendAck(Constants.ACK_COMMAND);
+ }
}catch ( Exception x ) {
- if (ChannelData.sendAckSync(msgs[i].getOptions()))
sendAck(Constants.FAIL_ACK_COMMAND);
+ if (ChannelData.sendAckSync(msgs[i].getOptions())) {
+ sendAck(Constants.FAIL_ACK_COMMAND);
+ }
log.error(sm.getString("bioReplicationTask.messageDataReceived.error"),x);
}
if ( getUseBufferPool() ) {
@@ -143,7 +153,9 @@ public class BioReplicationTask extends AbstractRxTask {
int length = in.read(buf);
while ( length >= 0 ) {
int count = reader.append(buf,0,length,true);
- if ( count > 0 ) execute(reader);
+ if ( count > 0 ) {
+ execute(reader);
+ }
length = in.read(buf);
}
}
diff --git a/java/org/apache/catalina/tribes/transport/bio/BioSender.java
b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
index 756e1eb..6c422c7 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
@@ -91,8 +91,9 @@ public class BioSender extends AbstractSender {
boolean connect = isConnected();
closeSocket();
if (connect) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(sm.getString("bioSender.disconnect",
getAddress().getHostAddress(), Integer.valueOf(getPort()), Long.valueOf(0)));
+ }
}
}
@@ -112,7 +113,9 @@ public class BioSender extends AbstractSender {
} catch (IOException x) {
SenderState.getSenderState(getDestination()).setSuspect();
exception = x;
- if (log.isTraceEnabled())
log.trace(sm.getString("bioSender.send.again",
getAddress().getHostAddress(),Integer.valueOf(getPort())),x);
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("bioSender.send.again",
getAddress().getHostAddress(),Integer.valueOf(getPort())),x);
+ }
while ( getAttempt()<getMaxRetryAttempts() ) {
try {
setAttempt(getAttempt()+1);
@@ -127,7 +130,9 @@ public class BioSender extends AbstractSender {
} finally {
setRequestCount(getRequestCount()+1);
keepalive();
- if ( exception != null ) throw exception;
+ if ( exception != null ) {
+ throw exception;
+ }
}
}
@@ -148,7 +153,9 @@ public class BioSender extends AbstractSender {
* @throws IOException Error opening socket
*/
protected void openSocket() throws IOException {
- if(isConnected()) return ;
+ if(isConnected()) {
+ return ;
+ }
try {
socket = new Socket();
InetSocketAddress sockaddr = new InetSocketAddress(getAddress(),
getPort());
@@ -167,12 +174,14 @@ public class BioSender extends AbstractSender {
soIn = socket.getInputStream();
setRequestCount(0);
setConnectTime(System.currentTimeMillis());
- if (log.isDebugEnabled())
- log.debug(sm.getString("bioSender.openSocket",
getAddress().getHostAddress(), Integer.valueOf(getPort()), Long.valueOf(0)));
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("bioSender.openSocket",
getAddress().getHostAddress(), Integer.valueOf(getPort()), Long.valueOf(0)));
+ }
} catch (IOException ex1) {
SenderState.getSenderState(getDestination()).setSuspect();
- if (log.isDebugEnabled())
-
log.debug(sm.getString("bioSender.openSocket.failure",getAddress().getHostAddress(),
Integer.valueOf(getPort()), Long.valueOf(0)), ex1);
+ if (log.isDebugEnabled()) {
+
log.debug(sm.getString("bioSender.openSocket.failure",getAddress().getHostAddress(),
Integer.valueOf(getPort()), Long.valueOf(0)), ex1);
+ }
throw ex1;
}
@@ -198,8 +207,9 @@ public class BioSender extends AbstractSender {
}
setRequestCount(0);
setConnected(false);
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(sm.getString("bioSender.closeSocket",getAddress().getHostAddress(),
Integer.valueOf(getPort()), Long.valueOf(0)));
+ }
}
}
@@ -225,11 +235,17 @@ public class BioSender extends AbstractSender {
protected void pushMessage(byte[] data, boolean reconnect, boolean
waitForAck) throws IOException {
keepalive();
- if ( reconnect ) closeSocket();
- if (!isConnected()) openSocket();
+ if ( reconnect ) {
+ closeSocket();
+ }
+ if (!isConnected()) {
+ openSocket();
+ }
soOut.write(data);
soOut.flush();
- if (waitForAck) waitForAck();
+ if (waitForAck) {
+ waitForAck();
+ }
SenderState.getSenderState(getDestination()).setReady();
}
@@ -260,8 +276,11 @@ public class BioSender extends AbstractSender {
i = soIn.read();
}
if (!ackReceived) {
- if (i == -1) throw new
IOException(sm.getString("bioSender.ack.eof",getAddress(),
Integer.valueOf(socket.getLocalPort())));
- else throw new
IOException(sm.getString("bioSender.ack.wrong",getAddress(),
Integer.valueOf(socket.getLocalPort())));
+ if (i == -1) {
+ throw new
IOException(sm.getString("bioSender.ack.eof",getAddress(),
Integer.valueOf(socket.getLocalPort())));
+ } else {
+ throw new
IOException(sm.getString("bioSender.ack.wrong",getAddress(),
Integer.valueOf(socket.getLocalPort())));
+ }
} else if ( failAckReceived && getThrowOnFailedAck()) {
throw new
RemoteProcessException(sm.getString("bioSender.fail.AckReceived"));
}
@@ -269,9 +288,13 @@ public class BioSender extends AbstractSender {
String errmsg = sm.getString("bioSender.ack.missing",
getAddress(), Integer.valueOf(socket.getLocalPort()),
Long.valueOf(getTimeout()));
if ( SenderState.getSenderState(getDestination()).isReady() ) {
SenderState.getSenderState(getDestination()).setSuspect();
- if ( log.isWarnEnabled() ) log.warn(errmsg, x);
+ if ( log.isWarnEnabled() ) {
+ log.warn(errmsg, x);
+ }
} else {
- if ( log.isDebugEnabled() )log.debug(errmsg, x);
+ if ( log.isDebugEnabled() ) {
+ log.debug(errmsg, x);
+ }
}
throw x;
} finally {
diff --git
a/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
b/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
index 375a36e..bbcb3db 100644
--- a/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
@@ -46,11 +46,15 @@ public class MultipointBioSender extends AbstractSender
implements MultiPointSen
try {
senders[i].sendMessage(data,(msg.getOptions()&Channel.SEND_OPTIONS_USE_ACK)==Channel.SEND_OPTIONS_USE_ACK);
} catch (Exception x) {
- if (cx == null) cx = new ChannelException(x);
+ if (cx == null) {
+ cx = new ChannelException(x);
+ }
cx.addFaultyMember(destination[i],x);
}
}
- if (cx!=null ) throw cx;
+ if (cx!=null ) {
+ throw cx;
+ }
}
@@ -68,15 +72,22 @@ public class MultipointBioSender extends AbstractSender
implements MultiPointSen
bioSenders.put(destination[i], sender);
}
result[i] = sender;
- if (!result[i].isConnected() ) result[i].connect();
+ if (!result[i].isConnected() ) {
+ result[i].connect();
+ }
result[i].keepalive();
}catch (Exception x ) {
- if ( cx== null ) cx = new ChannelException(x);
+ if ( cx== null ) {
+ cx = new ChannelException(x);
+ }
cx.addFaultyMember(destination[i],x);
}
}
- if ( cx!=null ) throw cx;
- else return result;
+ if ( cx!=null ) {
+ throw cx;
+ } else {
+ return result;
+ }
}
@Override
@@ -95,12 +106,16 @@ public class MultipointBioSender extends AbstractSender
implements MultiPointSen
BioSender sender = bioSenders.get(mbr);
sender.disconnect();
}catch ( Exception e ) {
- if ( x == null ) x = new ChannelException(e);
+ if ( x == null ) {
+ x = new ChannelException(e);
+ }
x.addFaultyMember(mbr,e);
}
bioSenders.remove(mbr);
}
- if ( x != null ) throw x;
+ if ( x != null ) {
+ throw x;
+ }
}
@Override
@@ -114,7 +129,9 @@ public class MultipointBioSender extends AbstractSender
implements MultiPointSen
public void remove(Member member) {
//disconnect senders
BioSender sender = bioSenders.remove(member);
- if ( sender != null ) sender.disconnect();
+ if ( sender != null ) {
+ sender.disconnect();
+ }
}
diff --git
a/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
b/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
index 8c92311..5ff69f0 100644
--- a/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
@@ -41,15 +41,18 @@ public class PooledMultiSender extends PooledSender {
if (sender == null) {
ChannelException cx = new ChannelException(sm.getString(
"pooledMultiSender.unable.retrieve.sender",
Long.toString(getMaxWait())));
- for (int i = 0; i < destination.length; i++)
+ for (int i = 0; i < destination.length; i++) {
cx.addFaultyMember(destination[i], new
NullPointerException(sm.getString("pooledMultiSender.retrieve.fail")));
+ }
throw cx;
} else {
sender.sendMessage(destination, msg);
}
sender.keepalive();
}finally {
- if ( sender != null ) returnSender(sender);
+ if ( sender != null ) {
+ returnSender(sender);
+ }
}
}
diff --git a/java/org/apache/catalina/tribes/util/ExecutorFactory.java
b/java/org/apache/catalina/tribes/util/ExecutorFactory.java
index cce71ec..a0da22d 100644
--- a/java/org/apache/catalina/tribes/util/ExecutorFactory.java
+++ b/java/org/apache/catalina/tribes/util/ExecutorFactory.java
@@ -96,7 +96,9 @@ public class ExecutorFactory {
}
public boolean force(Runnable o) {
- if ( parent.isShutdown() ) throw new
RejectedExecutionException(sm.getString("executorFactory.not.running"));
+ if ( parent.isShutdown() ) {
+ throw new
RejectedExecutionException(sm.getString("executorFactory.not.running"));
+ }
return super.offer(o); //forces the item onto the queue, to be
used if the task is rejected
}
diff --git a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
index 3266092..d0f2878 100644
--- a/java/org/apache/catalina/valves/rewrite/RewriteValve.java
+++ b/java/org/apache/catalina/valves/rewrite/RewriteValve.java
@@ -604,10 +604,12 @@ public class RewriteValve extends ValveBase {
Container host = null;
Container engine = null;
while (container != null) {
- if (container instanceof Host)
+ if (container instanceof Host) {
host = container;
- if (container instanceof Engine)
+ }
+ if (container instanceof Engine) {
engine = container;
+ }
container = container.getParent();
}
if (engine != null) {
diff --git a/java/org/apache/coyote/RequestInfo.java
b/java/org/apache/coyote/RequestInfo.java
index 629ca0f..1e67d40 100644
--- a/java/org/apache/coyote/RequestInfo.java
+++ b/java/org/apache/coyote/RequestInfo.java
@@ -166,8 +166,9 @@ public class RequestInfo {
bytesSent+=req.getResponse().getContentWritten();
requestCount++;
- if( req.getResponse().getStatus() >=400 )
+ if( req.getResponse().getStatus() >=400 ) {
errorCount++;
+ }
long t0=req.getStartTime();
long t1=System.currentTimeMillis();
long time=t1-t0;
diff --git a/java/org/apache/coyote/http11/Http11InputBuffer.java
b/java/org/apache/coyote/http11/Http11InputBuffer.java
index fd79100..bf11eb8 100644
--- a/java/org/apache/coyote/http11/Http11InputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11InputBuffer.java
@@ -249,10 +249,11 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
@Override
public int doRead(ByteChunk chunk) throws IOException {
- if (lastActiveFilter == -1)
+ if (lastActiveFilter == -1) {
return inputStreamInputBuffer.doRead(chunk);
- else
+ } else {
return activeFilters[lastActiveFilter].doRead(chunk);
+ }
}
@@ -1174,8 +1175,9 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
if (byteBuffer.position() >= byteBuffer.limit()) {
// The application is reading the HTTP request body which is
// always a blocking operation.
- if (!fill(true))
+ if (!fill(true)) {
return -1;
+ }
}
int length = byteBuffer.remaining();
diff --git a/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
b/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
index 01dd0ec..8b14ba8 100644
--- a/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
@@ -52,8 +52,9 @@ public class SavedRequestInputFilter implements InputFilter {
@Deprecated
@Override
public int doRead(ByteChunk chunk) throws IOException {
- if(input.getOffset()>= input.getEnd())
+ if(input.getOffset()>= input.getEnd()) {
return -1;
+ }
int writeLength = 0;
diff --git a/java/org/apache/el/lang/ELSupport.java
b/java/org/apache/el/lang/ELSupport.java
index 5b07838..c80b51d 100644
--- a/java/org/apache/el/lang/ELSupport.java
+++ b/java/org/apache/el/lang/ELSupport.java
@@ -537,8 +537,9 @@ public class ELSupport {
}
// new to spec
- if (obj == null)
+ if (obj == null) {
return null;
+ }
if (obj instanceof String) {
String str = (String) obj;
PropertyEditor editor = PropertyEditorManager.findEditor(type);
diff --git a/java/org/apache/jasper/compiler/SmapGenerator.java
b/java/org/apache/jasper/compiler/SmapGenerator.java
index 657e7e4..a57a320 100644
--- a/java/org/apache/jasper/compiler/SmapGenerator.java
+++ b/java/org/apache/jasper/compiler/SmapGenerator.java
@@ -92,8 +92,9 @@ public class SmapGenerator {
public synchronized void addStratum(SmapStratum stratum,
boolean defaultStratum) {
strata.add(stratum);
- if (defaultStratum)
+ if (defaultStratum) {
this.defaultStratum = stratum.getStratumName();
+ }
}
/**
@@ -130,8 +131,9 @@ public class SmapGenerator {
public synchronized String getString() {
// check state and initialize buffer
- if (outputFileName == null)
+ if (outputFileName == null) {
throw new IllegalStateException();
+ }
StringBuilder out = new StringBuilder();
// start the SMAP
diff --git a/java/org/apache/jasper/el/JspValueExpression.java
b/java/org/apache/jasper/el/JspValueExpression.java
index 6030c18..61a426c 100644
--- a/java/org/apache/jasper/el/JspValueExpression.java
+++ b/java/org/apache/jasper/el/JspValueExpression.java
@@ -62,10 +62,14 @@ public final class JspValueExpression extends
ValueExpression implements
context.notifyAfterEvaluation(getExpressionString());
return result;
} catch (PropertyNotFoundException e) {
- if (e instanceof JspPropertyNotFoundException) throw e;
+ if (e instanceof JspPropertyNotFoundException) {
+ throw e;
+ }
throw new JspPropertyNotFoundException(this.mark, e);
} catch (ELException e) {
- if (e instanceof JspELException) throw e;
+ if (e instanceof JspELException) {
+ throw e;
+ }
throw new JspELException(this.mark, e);
}
}
@@ -79,10 +83,14 @@ public final class JspValueExpression extends
ValueExpression implements
context.notifyAfterEvaluation(getExpressionString());
return result;
} catch (PropertyNotFoundException e) {
- if (e instanceof JspPropertyNotFoundException) throw e;
+ if (e instanceof JspPropertyNotFoundException) {
+ throw e;
+ }
throw new JspPropertyNotFoundException(this.mark, e);
} catch (ELException e) {
- if (e instanceof JspELException) throw e;
+ if (e instanceof JspELException) {
+ throw e;
+ }
throw new JspELException(this.mark, e);
}
}
@@ -96,13 +104,19 @@ public final class JspValueExpression extends
ValueExpression implements
this.target.setValue(context, value);
context.notifyAfterEvaluation(getExpressionString());
} catch (PropertyNotWritableException e) {
- if (e instanceof JspPropertyNotWritableException) throw e;
+ if (e instanceof JspPropertyNotWritableException) {
+ throw e;
+ }
throw new JspPropertyNotWritableException(this.mark, e);
} catch (PropertyNotFoundException e) {
- if (e instanceof JspPropertyNotFoundException) throw e;
+ if (e instanceof JspPropertyNotFoundException) {
+ throw e;
+ }
throw new JspPropertyNotFoundException(this.mark, e);
} catch (ELException e) {
- if (e instanceof JspELException) throw e;
+ if (e instanceof JspELException) {
+ throw e;
+ }
throw new JspELException(this.mark, e);
}
}
@@ -116,10 +130,14 @@ public final class JspValueExpression extends
ValueExpression implements
context.notifyAfterEvaluation(getExpressionString());
return result;
} catch (PropertyNotFoundException e) {
- if (e instanceof JspPropertyNotFoundException) throw e;
+ if (e instanceof JspPropertyNotFoundException) {
+ throw e;
+ }
throw new JspPropertyNotFoundException(this.mark, e);
} catch (ELException e) {
- if (e instanceof JspELException) throw e;
+ if (e instanceof JspELException) {
+ throw e;
+ }
throw new JspELException(this.mark, e);
}
}
diff --git a/java/org/apache/jasper/runtime/JspContextWrapper.java
b/java/org/apache/jasper/runtime/JspContextWrapper.java
index f969851..ccccd35 100644
--- a/java/org/apache/jasper/runtime/JspContextWrapper.java
+++ b/java/org/apache/jasper/runtime/JspContextWrapper.java
@@ -496,8 +496,9 @@ public class JspContextWrapper extends PageContext
implements VariableResolver {
*/
private String findAlias(String varName) {
- if (aliases == null)
+ if (aliases == null) {
return varName;
+ }
String alias = aliases.get(varName);
if (alias == null) {
diff --git a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
index f85642f..c145e3d 100644
--- a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
+++ b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
@@ -226,10 +226,11 @@ public class JspRuntimeLibrary {
return getValueFromBeanInfoPropertyEditor(
t, propertyName, s, propertyEditorClass);
} else if ( t.equals(Boolean.class) || t.equals(Boolean.TYPE) ) {
- if (s.equalsIgnoreCase("on") || s.equalsIgnoreCase("true"))
+ if (s.equalsIgnoreCase("on") || s.equalsIgnoreCase("true")) {
s = "true";
- else
+ } else {
s = "false";
+ }
return Boolean.valueOf(s);
} else if ( t.equals(Byte.class) || t.equals(Byte.TYPE) ) {
return Byte.valueOf(s);
diff --git a/java/org/apache/jasper/security/SecurityUtil.java
b/java/org/apache/jasper/security/SecurityUtil.java
index 724860e..954bb43 100644
--- a/java/org/apache/jasper/security/SecurityUtil.java
+++ b/java/org/apache/jasper/security/SecurityUtil.java
@@ -53,8 +53,9 @@ public final class SecurityUtil{
@Deprecated
public static String filter(String message) {
- if (message == null)
+ if (message == null) {
return null;
+ }
char content[] = new char[message.length()];
message.getChars(0, message.length(), content, 0);
diff --git a/java/org/apache/jasper/xmlparser/UCSReader.java
b/java/org/apache/jasper/xmlparser/UCSReader.java
index 2091ea8..9719d4a 100644
--- a/java/org/apache/jasper/xmlparser/UCSReader.java
+++ b/java/org/apache/jasper/xmlparser/UCSReader.java
@@ -116,29 +116,36 @@ public class UCSReader extends Reader {
@Override
public int read() throws IOException {
int b0 = fInputStream.read() & 0xff;
- if (b0 == 0xff)
+ if (b0 == 0xff) {
return -1;
+ }
int b1 = fInputStream.read() & 0xff;
- if (b1 == 0xff)
+ if (b1 == 0xff) {
return -1;
+ }
if(fEncoding >=4) {
int b2 = fInputStream.read() & 0xff;
- if (b2 == 0xff)
+ if (b2 == 0xff) {
return -1;
+ }
int b3 = fInputStream.read() & 0xff;
- if (b3 == 0xff)
+ if (b3 == 0xff) {
return -1;
- if (log.isDebugEnabled())
+ }
+ if (log.isDebugEnabled()) {
log.debug("b0 is " + (b0 & 0xff) + " b1 " + (b1 & 0xff) + " b2
" + (b2 & 0xff) + " b3 " + (b3 & 0xff));
- if (fEncoding == UCS4BE)
+ }
+ if (fEncoding == UCS4BE) {
return (b0<<24)+(b1<<16)+(b2<<8)+b3;
- else
+ } else {
return (b3<<24)+(b2<<16)+(b1<<8)+b0;
+ }
} else { // UCS-2
- if (fEncoding == UCS2BE)
+ if (fEncoding == UCS2BE) {
return (b0<<8)+b1;
- else
+ } else {
return (b1<<8)+b0;
+ }
}
} // read():int
@@ -163,7 +170,9 @@ public class UCSReader extends Reader {
byteLength = fBuffer.length;
}
int count = fInputStream.read(fBuffer, 0, byteLength);
- if(count == -1) return -1;
+ if(count == -1) {
+ return -1;
+ }
// try and make count be a multiple of the number of bytes we're
looking for
if(fEncoding >= 4) { // BigEndian
// this looks ugly, but it avoids an if at any rate...
@@ -171,8 +180,9 @@ public class UCSReader extends Reader {
for(int i=0; i<numToRead; i++) {
int charRead = fInputStream.read();
if(charRead == -1) { // end of input; something likely went
wrong!A Pad buffer with nulls.
- for (int j = i;j<numToRead; j++)
+ for (int j = i;j<numToRead; j++) {
fBuffer[count+j] = 0;
+ }
break;
} else {
fBuffer[count+i] = (byte)charRead;
@@ -201,15 +211,17 @@ public class UCSReader extends Reader {
if(fEncoding >=4) {
int b2 = fBuffer[curPos++] & 0xff;
int b3 = fBuffer[curPos++] & 0xff;
- if (fEncoding == UCS4BE)
+ if (fEncoding == UCS4BE) {
ch[offset+i] = (char)((b0<<24)+(b1<<16)+(b2<<8)+b3);
- else
+ } else {
ch[offset+i] = (char)((b3<<24)+(b2<<16)+(b1<<8)+b0);
+ }
} else { // UCS-2
- if (fEncoding == UCS2BE)
+ if (fEncoding == UCS2BE) {
ch[offset+i] = (char)((b0<<8)+b1);
- else
+ } else {
ch[offset+i] = (char)((b1<<8)+b0);
+ }
}
}
return numChars;
@@ -235,7 +247,9 @@ public class UCSReader extends Reader {
// away.
int charWidth = (fEncoding >=4)?2:1;
long bytesSkipped = fInputStream.skip(n<<charWidth);
- if((bytesSkipped & (charWidth | 1)) == 0) return bytesSkipped >>
charWidth;
+ if((bytesSkipped & (charWidth | 1)) == 0) {
+ return bytesSkipped >> charWidth;
+ }
return (bytesSkipped >> charWidth) + 1;
} // skip(long):long
diff --git a/java/org/apache/jasper/xmlparser/UTF8Reader.java
b/java/org/apache/jasper/xmlparser/UTF8Reader.java
index f98a41a..88cca21 100644
--- a/java/org/apache/jasper/xmlparser/UTF8Reader.java
+++ b/java/org/apache/jasper/xmlparser/UTF8Reader.java
@@ -206,8 +206,9 @@ public class UTF8Reader
// return character
if (DEBUG_READ) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("read(): 0x"+Integer.toHexString(c));
+ }
}
return c;
@@ -492,8 +493,9 @@ public class UTF8Reader
// return number of characters converted
if (DEBUG_READ) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("read(char[],"+offset+','+length+"): count="+count);
+ }
}
return count;
diff --git a/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
b/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
index 8a1a613..ab0dbe0 100644
--- a/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
+++ b/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
@@ -874,10 +874,11 @@ public class XMLEncodingDetector {
if (fCurrentEntity.position == fCurrentEntity.count - 1) {
fCurrentEntity.ch[0] = (char)c;
entityChanged = load(1, true);
- if (!entityChanged)
- // the load change the position to be 1,
+ if (!entityChanged) {
+ // the load change the position to be 1,
// need to restore it when entity not changed
fCurrentEntity.position = 0;
+ }
}
if (c == '\r' && external) {
// REVISIT: Does this need to be updated to fix the
@@ -896,8 +897,9 @@ public class XMLEncodingDetector {
/***/
}
// load more characters, if needed
- if (!entityChanged)
+ if (!entityChanged) {
fCurrentEntity.position++;
+ }
if (fCurrentEntity.position == fCurrentEntity.count) {
load(0, true);
}
diff --git a/java/org/apache/jasper/xmlparser/XMLStringBuffer.java
b/java/org/apache/jasper/xmlparser/XMLStringBuffer.java
index 3b4057a..001028d 100644
--- a/java/org/apache/jasper/xmlparser/XMLStringBuffer.java
+++ b/java/org/apache/jasper/xmlparser/XMLStringBuffer.java
@@ -99,8 +99,9 @@ public class XMLStringBuffer
public void append(char c) {
if (this.length + 1 > this.ch.length) {
int newLength = this.ch.length*2;
- if (newLength < this.ch.length + DEFAULT_SIZE)
+ if (newLength < this.ch.length + DEFAULT_SIZE) {
newLength = this.ch.length + DEFAULT_SIZE;
+ }
char[] newch = new char[newLength];
System.arraycopy(this.ch, 0, newch, 0, this.length);
this.ch = newch;
@@ -118,8 +119,9 @@ public class XMLStringBuffer
int length = s.length();
if (this.length + length > this.ch.length) {
int newLength = this.ch.length*2;
- if (newLength < this.length + length + DEFAULT_SIZE)
+ if (newLength < this.length + length + DEFAULT_SIZE) {
newLength = this.ch.length + length + DEFAULT_SIZE;
+ }
char[] newch = new char[newLength];
System.arraycopy(this.ch, 0, newch, 0, this.length);
this.ch = newch;
diff --git a/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
b/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
index 271ea34..8446b10 100644
--- a/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
+++ b/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
@@ -229,8 +229,9 @@ public class SecurityConstraint extends XmlEncodingBase
implements Serializable
authenticatedUsers = false;
String results[] = new String[authRoles.length + 1];
- for (int i = 0; i < authRoles.length; i++)
+ for (int i = 0; i < authRoles.length; i++) {
results[i] = authRoles[i];
+ }
results[authRoles.length] = ROLE_ALL_AUTHENTICATED_USERS;
authRoles = results;
authConstraint = true;
@@ -264,8 +265,9 @@ public class SecurityConstraint extends XmlEncodingBase
implements Serializable
}
String results[] = new String[authRoles.length + 1];
- for (int i = 0; i < authRoles.length; i++)
+ for (int i = 0; i < authRoles.length; i++) {
results[i] = authRoles[i];
+ }
results[authRoles.length] = authRole;
authRoles = results;
authConstraint = true;
@@ -297,8 +299,9 @@ public class SecurityConstraint extends XmlEncodingBase
implements Serializable
SecurityCollection results[] =
new SecurityCollection[collections.length + 1];
- for (int i = 0; i < collections.length; i++)
+ for (int i = 0; i < collections.length; i++) {
results[i] = collections[i];
+ }
results[collections.length] = collection;
collections = results;
diff --git
a/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
b/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
index c621eb1..d5db731 100644
--- a/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
+++ b/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
@@ -141,8 +141,9 @@ public class BaseNotificationBroadcaster implements
NotificationBroadcaster {
entries.iterator();
while (items.hasNext()) {
BaseNotificationBroadcasterEntry item = items.next();
- if (item.listener == listener)
+ if (item.listener == listener) {
items.remove();
+ }
}
}
diff --git a/java/org/apache/tomcat/util/net/NioBlockingSelector.java
b/java/org/apache/tomcat/util/net/NioBlockingSelector.java
index 4b61440..3199d04 100644
--- a/java/org/apache/tomcat/util/net/NioBlockingSelector.java
+++ b/java/org/apache/tomcat/util/net/NioBlockingSelector.java
@@ -255,23 +255,33 @@ public class NioBlockingSelector {
}
public void wakeup() {
- if (wakeupCounter.addAndGet(1)==0) selector.wakeup();
+ if (wakeupCounter.addAndGet(1)==0) {
+ selector.wakeup();
+ }
}
public void cancel(SelectionKey sk, NioSocketWrapper key, int ops){
if (sk!=null) {
sk.cancel();
sk.attach(null);
- if (SelectionKey.OP_WRITE==(ops&SelectionKey.OP_WRITE))
countDown(key.getWriteLatch());
- if
(SelectionKey.OP_READ==(ops&SelectionKey.OP_READ))countDown(key.getReadLatch());
+ if (SelectionKey.OP_WRITE==(ops&SelectionKey.OP_WRITE)) {
+ countDown(key.getWriteLatch());
+ }
+ if (SelectionKey.OP_READ==(ops&SelectionKey.OP_READ)) {
+ countDown(key.getReadLatch());
+ }
}
}
public void add(final NioSocketWrapper key, final int ops, final
KeyReference ref) {
- if ( key == null ) return;
+ if ( key == null ) {
+ return;
+ }
NioChannel nch = key.getSocket();
final SocketChannel ch = nch.getIOChannel();
- if ( ch == null ) return;
+ if ( ch == null ) {
+ return;
+ }
Runnable r = new RunnableAdd(ch, key, ops, ref);
events.offer(r);
@@ -279,10 +289,14 @@ public class NioBlockingSelector {
}
public void remove(final NioSocketWrapper key, final int ops) {
- if ( key == null ) return;
+ if ( key == null ) {
+ return;
+ }
NioChannel nch = key.getSocket();
final SocketChannel ch = nch.getIOChannel();
- if ( ch == null ) return;
+ if ( ch == null ) {
+ return;
+ }
Runnable r = new RunnableRemove(ch, key, ops);
events.offer(r);
@@ -326,15 +340,23 @@ public class NioBlockingSelector {
keyCount = selector.select(1000);
}
wakeupCounter.set(0);
- if (!run) break;
+ if (!run) {
+ break;
+ }
}catch ( NullPointerException x ) {
//sun bug 5076772 on windows JDK 1.5
- if (selector==null) throw x;
- if ( log.isDebugEnabled() ) log.debug("Possibly
encountered sun bug 5076772 on windows JDK 1.5",x);
+ if (selector==null) {
+ throw x;
+ }
+ if ( log.isDebugEnabled() ) {
+ log.debug("Possibly encountered sun bug 5076772 on
windows JDK 1.5",x);
+ }
continue;
} catch ( CancelledKeyException x ) {
//sun bug 5076772 on windows JDK 1.5
- if ( log.isDebugEnabled() ) log.debug("Possibly
encountered sun bug 5076772 on windows JDK 1.5",x);
+ if ( log.isDebugEnabled() ) {
+ log.debug("Possibly encountered sun bug 5076772 on
windows JDK 1.5",x);
+ }
continue;
} catch (Throwable x) {
ExceptionUtils.handleThrowable(x);
@@ -378,18 +400,24 @@ public class NioBlockingSelector {
// Cancels all remaining keys
selector.selectNow();
}catch( Exception ignore ) {
- if (log.isDebugEnabled())log.debug("",ignore);
+ if (log.isDebugEnabled()) {
+ log.debug("",ignore);
+ }
}
}
try {
selector.close();
}catch( Exception ignore ) {
- if (log.isDebugEnabled())log.debug("",ignore);
+ if (log.isDebugEnabled()) {
+ log.debug("",ignore);
+ }
}
}
public void countDown(CountDownLatch latch) {
- if ( latch == null ) return;
+ if ( latch == null ) {
+ return;
+ }
latch.countDown();
}
@@ -446,13 +474,21 @@ public class NioBlockingSelector {
SelectionKey sk = ch.keyFor(selector);
try {
if (sk == null) {
- if
(SelectionKey.OP_WRITE==(ops&SelectionKey.OP_WRITE))
countDown(key.getWriteLatch());
- if
(SelectionKey.OP_READ==(ops&SelectionKey.OP_READ))countDown(key.getReadLatch());
+ if
(SelectionKey.OP_WRITE==(ops&SelectionKey.OP_WRITE)) {
+ countDown(key.getWriteLatch());
+ }
+ if (SelectionKey.OP_READ==(ops&SelectionKey.OP_READ)) {
+ countDown(key.getReadLatch());
+ }
} else {
if (sk.isValid()) {
sk.interestOps(sk.interestOps() & (~ops));
- if
(SelectionKey.OP_WRITE==(ops&SelectionKey.OP_WRITE))
countDown(key.getWriteLatch());
- if
(SelectionKey.OP_READ==(ops&SelectionKey.OP_READ))countDown(key.getReadLatch());
+ if
(SelectionKey.OP_WRITE==(ops&SelectionKey.OP_WRITE)) {
+ countDown(key.getWriteLatch());
+ }
+ if
(SelectionKey.OP_READ==(ops&SelectionKey.OP_READ)) {
+ countDown(key.getReadLatch());
+ }
if (sk.interestOps()==0) {
sk.cancel();
sk.attach(null);
diff --git a/java/org/apache/tomcat/util/net/NioChannel.java
b/java/org/apache/tomcat/util/net/NioChannel.java
index 14b364d..9b9509f 100644
--- a/java/org/apache/tomcat/util/net/NioChannel.java
+++ b/java/org/apache/tomcat/util/net/NioChannel.java
@@ -114,7 +114,9 @@ public class NioChannel implements ByteChannel,
ScatteringByteChannel, Gathering
* @throws IOException If closing the secure channel fails.
*/
public void close(boolean force) throws IOException {
- if (isOpen() || force ) close();
+ if (isOpen() || force ) {
+ close();
+ }
}
/**
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 252b1d6..8500845 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -302,7 +302,9 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel> {
running = false;
unlockAccept();
for (int i=0; pollers!=null && i<pollers.length; i++) {
- if (pollers[i]==null) continue;
+ if (pollers[i]==null) {
+ continue;
+ }
pollers[i].destroy();
pollers[i] = null;
}
@@ -753,22 +755,30 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel> {
ka.setWriteTimeout(getConnectionTimeout());
PollerEvent r = eventCache.pop();
ka.interestOps(SelectionKey.OP_READ);//this is what OP_REGISTER
turns into.
- if ( r==null) r = new PollerEvent(socket,ka,OP_REGISTER);
- else r.reset(socket,ka,OP_REGISTER);
+ if ( r==null) {
+ r = new PollerEvent(socket,ka,OP_REGISTER);
+ } else {
+ r.reset(socket,ka,OP_REGISTER);
+ }
addEvent(r);
}
public NioSocketWrapper cancelledKey(SelectionKey key) {
NioSocketWrapper ka = null;
try {
- if ( key == null ) return null;//nothing to do
+ if ( key == null )
+ {
+ return null;//nothing to do
+ }
ka = (NioSocketWrapper) key.attach(null);
if (ka != null) {
// If attachment is non-null then there may be a current
// connection with an associated processor.
getHandler().release(ka);
}
- if (key.isValid()) key.cancel();
+ if (key.isValid()) {
+ key.cancel();
+ }
// If it is available, close the NioChannel first which should
// in turn close the underlying SocketChannel. The NioChannel
// needs to be closed first, if available, to ensure that TLS
@@ -809,7 +819,9 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel> {
}
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
- if (log.isDebugEnabled()) log.error("",e);
+ if (log.isDebugEnabled()) {
+ log.error("",e);
+ }
}
return ka;
}
@@ -1015,7 +1027,9 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel> {
return SendfileState.PENDING;
}
} catch (IOException x) {
- if (log.isDebugEnabled()) log.debug("Unable to complete
sendfile request:", x);
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to complete sendfile request:", x);
+ }
if (!calledByProcessor && sc != null) {
close(sc, sk);
}
@@ -1136,8 +1150,11 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel> {
public CountDownLatch getReadLatch() { return readLatch; }
public CountDownLatch getWriteLatch() { return writeLatch; }
protected CountDownLatch resetLatch(CountDownLatch latch) {
- if ( latch==null || latch.getCount() == 0 ) return null;
- else throw new IllegalStateException("Latch must be at count 0");
+ if ( latch==null || latch.getCount() == 0 ) {
+ return null;
+ } else {
+ throw new IllegalStateException("Latch must be at count 0");
+ }
}
public void resetReadLatch() { readLatch = resetLatch(readLatch); }
public void resetWriteLatch() { writeLatch = resetLatch(writeLatch); }
@@ -1145,14 +1162,17 @@ public class NioEndpoint extends
AbstractJsseEndpoint<NioChannel> {
protected CountDownLatch startLatch(CountDownLatch latch, int cnt) {
if ( latch == null || latch.getCount() == 0 ) {
return new CountDownLatch(cnt);
+ } else {
+ throw new IllegalStateException("Latch must be at count 0 or
null.");
}
- else throw new IllegalStateException("Latch must be at count 0 or
null.");
}
public void startReadLatch(int cnt) { readLatch =
startLatch(readLatch,cnt);}
public void startWriteLatch(int cnt) { writeLatch =
startLatch(writeLatch,cnt);}
protected void awaitLatch(CountDownLatch latch, long timeout, TimeUnit
unit) throws InterruptedException {
- if ( latch == null ) throw new IllegalStateException("Latch cannot
be null");
+ if ( latch == null ) {
+ throw new IllegalStateException("Latch cannot be null");
+ }
// Note: While the return value is ignored if the latch does time
// out, logic further up the call stack will trigger a
// SocketTimeoutException
diff --git a/java/org/apache/tomcat/util/net/NioSelectorPool.java
b/java/org/apache/tomcat/util/net/NioSelectorPool.java
index 73d84c1..791f54e 100644
--- a/java/org/apache/tomcat/util/net/NioSelectorPool.java
+++ b/java/org/apache/tomcat/util/net/NioSelectorPool.java
@@ -202,7 +202,10 @@ public class NioSelectorPool {
time = System.currentTimeMillis(); //reset our timeout
timer
continue; //we successfully wrote, try again without a
selector
}
- if (cnt==0 && (!block)) break; //don't block
+ if (cnt==0 && (!block))
+ {
+ break; //don't block
+ }
}
if (selector != null) {
//register OP_WRITE to the selector
@@ -230,7 +233,10 @@ public class NioSelectorPool {
} finally {
if (key != null) {
key.cancel();
- if (selector != null) selector.selectNow();//removes the key
from this selector
+ if (selector != null)
+ {
+ selector.selectNow();//removes the key from this selector
+ }
}
}
return written;
@@ -289,7 +295,10 @@ public class NioSelectorPool {
break;
}
read += cnt;
- if (cnt > 0) continue; //read some more
+ if (cnt > 0)
+ {
+ continue; //read some more
+ }
if (cnt == 0 && (read > 0 || (!block))) {
break; //we are done reading
}
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index fdc87d2..46735ad 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -184,7 +184,10 @@ public class SecureNioChannel extends NioChannel {
}
}
- if (!flush(netOutBuffer)) return SelectionKey.OP_WRITE; //we still
have data to write
+ if (!flush(netOutBuffer))
+ {
+ return SelectionKey.OP_WRITE; //we still have data to write
+ }
SSLEngineResult handshake = null;
@@ -220,8 +223,9 @@ public class SecureNioChannel extends NioChannel {
handshake = handshakeWrap(write);
}
if (handshake.getStatus() == Status.OK) {
- if (handshakeStatus == HandshakeStatus.NEED_TASK)
+ if (handshakeStatus == HandshakeStatus.NEED_TASK) {
handshakeStatus = tasks();
+ }
} else if (handshake.getStatus() == Status.CLOSED) {
flush(netOutBuffer);
return -1;
@@ -241,8 +245,9 @@ public class SecureNioChannel extends NioChannel {
//perform the unwrap function
handshake = handshakeUnwrap(read);
if ( handshake.getStatus() == Status.OK ) {
- if (handshakeStatus == HandshakeStatus.NEED_TASK)
+ if (handshakeStatus == HandshakeStatus.NEED_TASK) {
handshakeStatus = tasks();
+ }
} else if ( handshake.getStatus() ==
Status.BUFFER_UNDERFLOW ){
//read more data, reregister for OP_READ
return SelectionKey.OP_READ;
@@ -374,10 +379,18 @@ public class SecureNioChannel extends NioChannel {
@SuppressWarnings("null") // key cannot be null
public void rehandshake(long timeout) throws IOException {
//validate the network buffers are empty
- if (netInBuffer.position() > 0 &&
netInBuffer.position()<netInBuffer.limit()) throw new
IOException(sm.getString("channel.nio.ssl.netInputNotEmpty"));
- if (netOutBuffer.position() > 0 &&
netOutBuffer.position()<netOutBuffer.limit()) throw new
IOException(sm.getString("channel.nio.ssl.netOutputNotEmpty"));
- if (!getBufHandler().isReadBufferEmpty()) throw new
IOException(sm.getString("channel.nio.ssl.appInputNotEmpty"));
- if (!getBufHandler().isWriteBufferEmpty()) throw new
IOException(sm.getString("channel.nio.ssl.appOutputNotEmpty"));
+ if (netInBuffer.position() > 0 &&
netInBuffer.position()<netInBuffer.limit()) {
+ throw new
IOException(sm.getString("channel.nio.ssl.netInputNotEmpty"));
+ }
+ if (netOutBuffer.position() > 0 &&
netOutBuffer.position()<netOutBuffer.limit()) {
+ throw new
IOException(sm.getString("channel.nio.ssl.netOutputNotEmpty"));
+ }
+ if (!getBufHandler().isReadBufferEmpty()) {
+ throw new
IOException(sm.getString("channel.nio.ssl.appInputNotEmpty"));
+ }
+ if (!getBufHandler().isWriteBufferEmpty()) {
+ throw new
IOException(sm.getString("channel.nio.ssl.appOutputNotEmpty"));
+ }
handshakeComplete = false;
boolean isReadable = false;
boolean isWriteable = false;
@@ -822,7 +835,9 @@ public class SecureNioChannel extends NioChannel {
netOutBuffer.flip();
if (result.getStatus() == Status.OK) {
- if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK)
tasks();
+ if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
+ tasks();
+ }
} else {
throw new IOException(sm.getString("channel.nio.ssl.wrapFail",
result.getStatus()));
}
diff --git a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
index dc668e5..1de21f1 100644
--- a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
@@ -172,8 +172,9 @@ public class StandardJarScanner implements JarScanner {
}
if (jarScanFilter instanceof StandardJarScanFilter) {
- if (((StandardJarScanFilter) jarScanFilter).isSkipAll())
+ if (((StandardJarScanFilter) jarScanFilter).isSkipAll()) {
return;
+ }
}
Set<URL> processedURLs = new HashSet<>();
@@ -289,8 +290,9 @@ public class StandardJarScanner implements JarScanner {
Set<URL> processedURLs, boolean isWebapp, Deque<URL>
classPathUrlsToProcess) {
if (jarScanFilter instanceof StandardJarScanFilter) {
- if (((StandardJarScanFilter) jarScanFilter).isSkipAll())
+ if (((StandardJarScanFilter) jarScanFilter).isSkipAll()) {
return;
+ }
}
while (!classPathUrlsToProcess.isEmpty()) {
diff --git
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
index fe3c60f..faf73f2 100644
---
a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
+++
b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
@@ -637,8 +637,11 @@ public class ConnectionPool extends
NotificationBroadcasterSupport
getPoolProperties().setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
boolean shouldBeEnabled = getPoolProperties().isPoolSweeperEnabled();
//make sure pool cleaner starts/stops when it should
- if (!wasEnabled && shouldBeEnabled)
pool.initializePoolCleaner(getPoolProperties());
- else if (wasEnabled && !shouldBeEnabled) pool.terminatePoolCleaner();
+ if (!wasEnabled && shouldBeEnabled) {
+ pool.initializePoolCleaner(getPoolProperties());
+ } else if (wasEnabled && !shouldBeEnabled) {
+ pool.terminatePoolCleaner();
+ }
}
@@ -668,8 +671,11 @@ public class ConnectionPool extends
NotificationBroadcasterSupport
getPoolProperties().setRemoveAbandoned(removeAbandoned);
boolean shouldBeEnabled = getPoolProperties().isPoolSweeperEnabled();
//make sure pool cleaner starts/stops when it should
- if (!wasEnabled && shouldBeEnabled)
pool.initializePoolCleaner(getPoolProperties());
- else if (wasEnabled && !shouldBeEnabled) pool.terminatePoolCleaner();
+ if (!wasEnabled && shouldBeEnabled) {
+ pool.initializePoolCleaner(getPoolProperties());
+ } else if (wasEnabled && !shouldBeEnabled) {
+ pool.terminatePoolCleaner();
+ }
}
@@ -679,8 +685,11 @@ public class ConnectionPool extends
NotificationBroadcasterSupport
getPoolProperties().setRemoveAbandonedTimeout(removeAbandonedTimeout);
boolean shouldBeEnabled = getPoolProperties().isPoolSweeperEnabled();
//make sure pool cleaner starts/stops when it should
- if (!wasEnabled && shouldBeEnabled)
pool.initializePoolCleaner(getPoolProperties());
- else if (wasEnabled && !shouldBeEnabled) pool.terminatePoolCleaner();
+ if (!wasEnabled && shouldBeEnabled) {
+ pool.initializePoolCleaner(getPoolProperties());
+ } else if (wasEnabled && !shouldBeEnabled) {
+ pool.terminatePoolCleaner();
+ }
}
@@ -708,8 +717,11 @@ public class ConnectionPool extends
NotificationBroadcasterSupport
getPoolProperties().setTestWhileIdle(testWhileIdle);
boolean shouldBeEnabled = getPoolProperties().isPoolSweeperEnabled();
//make sure pool cleaner starts/stops when it should
- if (!wasEnabled && shouldBeEnabled)
pool.initializePoolCleaner(getPoolProperties());
- else if (wasEnabled && !shouldBeEnabled) pool.terminatePoolCleaner();
+ if (!wasEnabled && shouldBeEnabled) {
+ pool.initializePoolCleaner(getPoolProperties());
+ } else if (wasEnabled && !shouldBeEnabled) {
+ pool.terminatePoolCleaner();
+ }
}
diff --git a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
index ad3df9d..8ef1be8 100644
--- a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
+++ b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
@@ -127,8 +127,9 @@ public final class ExampleFilter implements Filter {
@Override
public String toString() {
- if (filterConfig == null)
+ if (filterConfig == null) {
return ("ExampleFilter()");
+ }
return "ExampleFilter(" + filterConfig + ")";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
