You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/05/26 16:07:15 UTC
[tomcat] branch 8.5.x updated (6a23da6 -> ede6478)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 6a23da6 Code clean-up. Remove unused import.
new 67f9942 Code clean-up. Add braces for clarity
new ede6478 Code clean-up. Add braces for clarity.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../storeconfig/ConnectorStoreAppender.java | 6 +-
.../catalina/storeconfig/CredentialHandlerSF.java | 6 +-
.../apache/catalina/storeconfig/InterceptorSF.java | 6 +-
java/org/apache/catalina/storeconfig/LoaderSF.java | 3 +-
.../org/apache/catalina/storeconfig/ManagerSF.java | 6 +-
.../catalina/storeconfig/NamingResourcesSF.java | 3 +-
java/org/apache/catalina/storeconfig/RealmSF.java | 6 +-
.../catalina/storeconfig/StandardContextSF.java | 31 ++-
.../catalina/storeconfig/StandardEngineSF.java | 3 +-
.../catalina/storeconfig/StandardHostSF.java | 3 +-
.../apache/catalina/storeconfig/StoreAppender.java | 12 +-
.../apache/catalina/storeconfig/StoreConfig.java | 3 +-
.../catalina/storeconfig/StoreContextAppender.java | 21 +-
.../catalina/storeconfig/StoreDescription.java | 23 +-
.../catalina/storeconfig/StoreFactoryBase.java | 9 +-
.../catalina/storeconfig/StoreFactoryRule.java | 3 +-
.../catalina/storeconfig/WatchedResourceSF.java | 3 +-
.../catalina/storeconfig/WrapperLifecycleSF.java | 3 +-
.../catalina/storeconfig/WrapperListenerSF.java | 3 +-
java/org/apache/catalina/tribes/ByteMessage.java | 4 +-
.../apache/catalina/tribes/ChannelException.java | 23 +-
java/org/apache/catalina/tribes/UniqueId.java | 17 +-
.../catalina/tribes/group/AbsoluteOrder.java | 16 +-
.../catalina/tribes/group/ChannelCoordinator.java | 32 ++-
.../tribes/group/ChannelInterceptorBase.java | 66 ++++--
.../apache/catalina/tribes/group/GroupChannel.java | 68 ++++--
.../apache/catalina/tribes/group/RpcChannel.java | 43 +++-
.../interceptors/DomainFilterInterceptor.java | 48 ++--
.../group/interceptors/EncryptInterceptor.java | 36 +--
.../interceptors/FragmentationInterceptor.java | 15 +-
.../interceptors/MessageDispatchInterceptor.java | 4 +-
.../group/interceptors/NonBlockingCoordinator.java | 96 ++++++--
.../group/interceptors/OrderInterceptor.java | 53 +++--
.../interceptors/StaticMembershipInterceptor.java | 55 +++--
.../group/interceptors/TcpFailureDetector.java | 79 +++++--
.../group/interceptors/TcpPingInterceptor.java | 25 ++-
.../group/interceptors/ThroughputInterceptor.java | 19 +-
.../interceptors/TwoPhaseCommitInterceptor.java | 11 +-
java/org/apache/catalina/tribes/io/BufferPool.java | 15 +-
.../org/apache/catalina/tribes/io/ChannelData.java | 12 +-
.../apache/catalina/tribes/io/ObjectReader.java | 8 +-
.../catalina/tribes/io/ReplicationStream.java | 21 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 52 +++--
.../apache/catalina/tribes/jmx/JmxRegistry.java | 24 +-
.../catalina/tribes/membership/McastService.java | 66 ++++--
.../tribes/membership/McastServiceImpl.java | 109 +++++++---
.../catalina/tribes/membership/MemberImpl.java | 4 +-
.../catalina/tribes/membership/Membership.java | 4 +-
.../catalina/tribes/membership/StaticMember.java | 26 ++-
.../tribes/tipis/AbstractReplicatedMap.java | 241 +++++++++++++++------
.../catalina/tribes/tipis/LazyReplicatedMap.java | 21 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 41 +++-
.../catalina/tribes/transport/AbstractSender.java | 14 +-
.../catalina/tribes/transport/PooledSender.java | 15 +-
.../catalina/tribes/transport/ReceiverBase.java | 32 ++-
.../tribes/transport/ReplicationTransmitter.java | 8 +-
.../catalina/tribes/transport/RxTaskPool.java | 9 +-
.../catalina/tribes/transport/nio/NioReceiver.java | 64 ++++--
.../tribes/transport/nio/NioReplicationTask.java | 70 ++++--
.../catalina/tribes/transport/nio/NioSender.java | 65 ++++--
.../tribes/transport/nio/ParallelNioSender.java | 85 ++++++--
.../tribes/transport/nio/PooledParallelSender.java | 7 +-
java/org/apache/catalina/tribes/util/Arrays.java | 74 +++++--
.../catalina/tribes/util/ExecutorFactory.java | 16 +-
.../apache/catalina/tribes/util/UUIDGenerator.java | 7 +-
.../catalina/users/MemoryUserDatabaseFactory.java | 3 +-
java/org/apache/catalina/util/Extension.java | 45 ++--
.../org/apache/catalina/util/ManifestResource.java | 16 +-
java/org/apache/catalina/util/ResourceSet.java | 9 +-
java/org/apache/catalina/util/ServerInfo.java | 9 +-
.../catalina/util/StandardSessionIdGenerator.java | 10 +-
java/org/apache/coyote/AbstractProtocol.java | 4 +-
java/org/apache/coyote/RequestGroupInfo.java | 3 +-
java/org/apache/coyote/Response.java | 10 +-
java/org/apache/coyote/ajp/AjpMessage.java | 6 +-
java/org/apache/coyote/ajp/AjpProcessor.java | 3 +-
java/org/apache/coyote/ajp/Constants.java | 5 +-
.../apache/coyote/http11/Http11InputBuffer.java | 21 +-
.../apache/coyote/http11/Http11OutputBuffer.java | 3 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 3 +-
.../http11/filters/SavedRequestInputFilter.java | 3 +-
java/org/apache/coyote/http2/HPackHuffman.java | 16 +-
java/org/apache/el/lang/ELArithmetic.java | 34 +--
java/org/apache/el/lang/ExpressionBuilder.java | 7 +-
java/org/apache/el/lang/FunctionMapperImpl.java | 4 +-
java/org/apache/el/util/ReflectionUtil.java | 6 +-
java/org/apache/jasper/EmbeddedServletOptions.java | 9 +-
java/org/apache/jasper/JspC.java | 17 +-
java/org/apache/jasper/compiler/AntCompiler.java | 6 +-
java/org/apache/jasper/compiler/Collector.java | 3 +-
java/org/apache/jasper/compiler/Compiler.java | 9 +-
java/org/apache/jasper/compiler/ELParser.java | 3 +-
java/org/apache/jasper/compiler/Generator.java | 83 ++++---
java/org/apache/jasper/compiler/JDTCompiler.java | 3 +-
.../apache/jasper/compiler/JspDocumentParser.java | 11 +-
java/org/apache/jasper/compiler/JspReader.java | 39 ++--
java/org/apache/jasper/compiler/Node.java | 3 +-
java/org/apache/jasper/compiler/PageDataImpl.java | 4 +-
java/org/apache/jasper/compiler/PageInfo.java | 78 ++++---
java/org/apache/jasper/compiler/Parser.java | 15 +-
.../apache/jasper/compiler/ParserController.java | 4 +-
.../apache/jasper/compiler/ScriptingVariabler.java | 5 +-
java/org/apache/jasper/compiler/ServletWriter.java | 6 +-
java/org/apache/jasper/compiler/SmapStratum.java | 39 ++--
java/org/apache/jasper/compiler/SmapUtil.java | 45 ++--
.../apache/jasper/compiler/TagFileProcessor.java | 9 +-
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 3 +-
.../apache/jasper/compiler/TagPluginManager.java | 9 +-
java/org/apache/jasper/compiler/Validator.java | 42 ++--
java/org/apache/jasper/el/ELContextWrapper.java | 4 +-
java/org/apache/jasper/el/JspMethodExpression.java | 24 +-
.../org/apache/jasper/runtime/BodyContentImpl.java | 10 +-
java/org/apache/jasper/runtime/JspFactoryImpl.java | 3 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 148 ++++++++-----
java/org/apache/jasper/runtime/JspWriterImpl.java | 63 ++++--
.../org/apache/jasper/runtime/PageContextImpl.java | 51 +++--
java/org/apache/jasper/runtime/TagHandlerPool.java | 15 +-
java/org/apache/jasper/servlet/JasperLoader.java | 6 +-
.../apache/jasper/servlet/JspCServletContext.java | 6 +-
java/org/apache/jasper/servlet/JspServlet.java | 4 +-
java/org/apache/jasper/tagplugins/jstl/Util.java | 53 +++--
res/checkstyle/checkstyle.xml | 2 +-
122 files changed, 2111 insertions(+), 916 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Code clean-up. Add braces for clarity.
Posted by ma...@apache.org.
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 ede6478c37fac25efddf61a60caed74fd2847bbb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 26 17:03:32 2021 +0100
Code clean-up. Add braces for clarity.
Still testing changes to CI
---
.../catalina/users/MemoryUserDatabaseFactory.java | 3 +-
java/org/apache/catalina/util/Extension.java | 45 ++++---
.../org/apache/catalina/util/ManifestResource.java | 16 ++-
java/org/apache/catalina/util/ResourceSet.java | 9 +-
java/org/apache/catalina/util/ServerInfo.java | 9 +-
.../catalina/util/StandardSessionIdGenerator.java | 10 +-
java/org/apache/coyote/AbstractProtocol.java | 4 +-
java/org/apache/coyote/RequestGroupInfo.java | 3 +-
java/org/apache/coyote/Response.java | 10 +-
java/org/apache/coyote/ajp/AjpMessage.java | 6 +-
java/org/apache/coyote/ajp/AjpProcessor.java | 3 +-
java/org/apache/coyote/ajp/Constants.java | 5 +-
.../apache/coyote/http11/Http11InputBuffer.java | 21 ++-
.../apache/coyote/http11/Http11OutputBuffer.java | 3 +-
.../coyote/http11/filters/ChunkedInputFilter.java | 3 +-
.../http11/filters/SavedRequestInputFilter.java | 3 +-
java/org/apache/coyote/http2/HPackHuffman.java | 16 ++-
java/org/apache/el/lang/ELArithmetic.java | 34 +++--
java/org/apache/el/lang/ExpressionBuilder.java | 7 +-
java/org/apache/el/lang/FunctionMapperImpl.java | 4 +-
java/org/apache/el/util/ReflectionUtil.java | 6 +-
java/org/apache/jasper/EmbeddedServletOptions.java | 9 +-
java/org/apache/jasper/JspC.java | 17 ++-
java/org/apache/jasper/compiler/AntCompiler.java | 6 +-
java/org/apache/jasper/compiler/Collector.java | 3 +-
java/org/apache/jasper/compiler/Compiler.java | 9 +-
java/org/apache/jasper/compiler/ELParser.java | 3 +-
java/org/apache/jasper/compiler/Generator.java | 83 +++++++-----
java/org/apache/jasper/compiler/JDTCompiler.java | 3 +-
.../apache/jasper/compiler/JspDocumentParser.java | 11 +-
java/org/apache/jasper/compiler/JspReader.java | 39 ++++--
java/org/apache/jasper/compiler/Node.java | 3 +-
java/org/apache/jasper/compiler/PageDataImpl.java | 4 +-
java/org/apache/jasper/compiler/PageInfo.java | 78 ++++++-----
java/org/apache/jasper/compiler/Parser.java | 15 ++-
.../apache/jasper/compiler/ParserController.java | 4 +-
.../apache/jasper/compiler/ScriptingVariabler.java | 5 +-
java/org/apache/jasper/compiler/ServletWriter.java | 6 +-
java/org/apache/jasper/compiler/SmapStratum.java | 39 ++++--
java/org/apache/jasper/compiler/SmapUtil.java | 45 ++++---
.../apache/jasper/compiler/TagFileProcessor.java | 9 +-
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 3 +-
.../apache/jasper/compiler/TagPluginManager.java | 9 +-
java/org/apache/jasper/compiler/Validator.java | 42 ++++--
java/org/apache/jasper/el/ELContextWrapper.java | 4 +-
java/org/apache/jasper/el/JspMethodExpression.java | 24 +++-
.../org/apache/jasper/runtime/BodyContentImpl.java | 10 +-
java/org/apache/jasper/runtime/JspFactoryImpl.java | 3 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 148 +++++++++++++--------
java/org/apache/jasper/runtime/JspWriterImpl.java | 63 ++++++---
.../org/apache/jasper/runtime/PageContextImpl.java | 51 ++++---
java/org/apache/jasper/runtime/TagHandlerPool.java | 15 ++-
java/org/apache/jasper/servlet/JasperLoader.java | 6 +-
.../apache/jasper/servlet/JspCServletContext.java | 6 +-
java/org/apache/jasper/servlet/JspServlet.java | 4 +-
java/org/apache/jasper/tagplugins/jstl/Util.java | 53 +++++---
res/checkstyle/checkstyle.xml | 2 +-
57 files changed, 687 insertions(+), 367 deletions(-)
diff --git a/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java b/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
index 6d01ac1..8c23fed 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
@@ -106,8 +106,9 @@ public class MemoryUserDatabaseFactory implements ObjectFactory {
// Return the configured database instance
database.open();
// Don't try something we know won't work
- if (!database.getReadonly())
+ if (!database.getReadonly()) {
database.save();
+ }
return database;
}
diff --git a/java/org/apache/catalina/util/Extension.java b/java/org/apache/catalina/util/Extension.java
index 172f313..b326561 100644
--- a/java/org/apache/catalina/util/Extension.java
+++ b/java/org/apache/catalina/util/Extension.java
@@ -181,32 +181,38 @@ public final class Extension {
public boolean isCompatibleWith(Extension required) {
// Extension Name must match
- if (extensionName == null)
+ if (extensionName == null) {
return false;
- if (!extensionName.equals(required.getExtensionName()))
+ }
+ if (!extensionName.equals(required.getExtensionName())) {
return false;
+ }
// If specified, available specification version must be >= required
if (required.getSpecificationVersion() != null) {
if (!isNewer(specificationVersion,
- required.getSpecificationVersion()))
+ required.getSpecificationVersion())) {
return false;
+ }
}
// If specified, Implementation Vendor ID must match
if (required.getImplementationVendorId() != null) {
- if (implementationVendorId == null)
+ if (implementationVendorId == null) {
return false;
+ }
if (!implementationVendorId.equals(required
- .getImplementationVendorId()))
+ .getImplementationVendorId())) {
return false;
+ }
}
// If specified, Implementation version must be >= required
if (required.getImplementationVersion() != null) {
if (!isNewer(implementationVersion,
- required.getImplementationVersion()))
+ required.getImplementationVersion())) {
return false;
+ }
}
// This available optional package satisfies the requirements
@@ -263,32 +269,39 @@ public final class Extension {
private boolean isNewer(String first, String second)
throws NumberFormatException {
- if ((first == null) || (second == null))
+ if ((first == null) || (second == null)) {
return false;
- if (first.equals(second))
+ }
+ if (first.equals(second)) {
return true;
+ }
StringTokenizer fTok = new StringTokenizer(first, ".", true);
StringTokenizer sTok = new StringTokenizer(second, ".", true);
int fVersion = 0;
int sVersion = 0;
while (fTok.hasMoreTokens() || sTok.hasMoreTokens()) {
- if (fTok.hasMoreTokens())
+ if (fTok.hasMoreTokens()) {
fVersion = Integer.parseInt(fTok.nextToken());
- else
+ } else {
fVersion = 0;
- if (sTok.hasMoreTokens())
+ }
+ if (sTok.hasMoreTokens()) {
sVersion = Integer.parseInt(sTok.nextToken());
- else
+ } else {
sVersion = 0;
- if (fVersion < sVersion)
+ }
+ if (fVersion < sVersion) {
return false;
- else if (fVersion > sVersion)
+ } else if (fVersion > sVersion) {
return true;
- if (fTok.hasMoreTokens()) // Swallow the periods
+ }
+ if (fTok.hasMoreTokens()) {
fTok.nextToken();
- if (sTok.hasMoreTokens())
+ }
+ if (sTok.hasMoreTokens()) {
sTok.nextToken();
+ }
}
return true; // Exact match
diff --git a/java/org/apache/catalina/util/ManifestResource.java b/java/org/apache/catalina/util/ManifestResource.java
index 2402b51..d4c80de 100644
--- a/java/org/apache/catalina/util/ManifestResource.java
+++ b/java/org/apache/catalina/util/ManifestResource.java
@@ -107,7 +107,9 @@ public class ManifestResource {
return true;
}
for (Extension ext : requiredExtensions) {
- if (!ext.isFulfilled()) return false;
+ if (!ext.isFulfilled()) {
+ return false;
+ }
}
return true;
}
@@ -154,8 +156,9 @@ public class ManifestResource {
Attributes attributes = manifest.getMainAttributes();
String names = attributes.getValue("Extension-List");
- if (names == null)
+ if (names == null) {
return null;
+ }
ArrayList<Extension> extensionList = new ArrayList<>();
names += " ";
@@ -163,15 +166,17 @@ public class ManifestResource {
while (true) {
int space = names.indexOf(' ');
- if (space < 0)
+ if (space < 0) {
break;
+ }
String name = names.substring(0, space).trim();
names = names.substring(space + 1);
String value =
attributes.getValue(name + "-Extension-Name");
- if (value == null)
+ if (value == null) {
continue;
+ }
Extension extension = new Extension();
extension.setExtensionName(value);
extension.setImplementationURL
@@ -201,8 +206,9 @@ public class ManifestResource {
Attributes attributes = manifest.getMainAttributes();
String name = attributes.getValue("Extension-Name");
- if (name == null)
+ if (name == null) {
return null;
+ }
ArrayList<Extension> extensionList = new ArrayList<>();
diff --git a/java/org/apache/catalina/util/ResourceSet.java b/java/org/apache/catalina/util/ResourceSet.java
index 4e6dc68..a551d5a 100644
--- a/java/org/apache/catalina/util/ResourceSet.java
+++ b/java/org/apache/catalina/util/ResourceSet.java
@@ -138,9 +138,10 @@ public final class ResourceSet<T> extends HashSet<T> {
*/
@Override
public boolean add(T o) {
- if (locked)
+ if (locked) {
throw new IllegalStateException
(sm.getString("resourceSet.locked"));
+ }
return super.add(o);
}
@@ -153,9 +154,10 @@ public final class ResourceSet<T> extends HashSet<T> {
@Override
public void clear() {
- if (locked)
+ if (locked) {
throw new IllegalStateException
(sm.getString("resourceSet.locked"));
+ }
super.clear();
}
@@ -171,9 +173,10 @@ public final class ResourceSet<T> extends HashSet<T> {
*/
@Override
public boolean remove(Object o) {
- if (locked)
+ if (locked) {
throw new IllegalStateException
(sm.getString("resourceSet.locked"));
+ }
return super.remove(o);
}
diff --git a/java/org/apache/catalina/util/ServerInfo.java b/java/org/apache/catalina/util/ServerInfo.java
index 9ceb887..c6dd418 100644
--- a/java/org/apache/catalina/util/ServerInfo.java
+++ b/java/org/apache/catalina/util/ServerInfo.java
@@ -68,12 +68,15 @@ public class ServerInfo {
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
}
- if (info == null)
+ if (info == null) {
info = "Apache Tomcat 8.5.x-dev";
- if (built == null)
+ }
+ if (built == null) {
built = "unknown";
- if (number == null)
+ }
+ if (number == null) {
number = "8.5.x";
+ }
serverInfo = info;
serverBuilt = built;
diff --git a/java/org/apache/catalina/util/StandardSessionIdGenerator.java b/java/org/apache/catalina/util/StandardSessionIdGenerator.java
index 437a28a..ea6ea65 100644
--- a/java/org/apache/catalina/util/StandardSessionIdGenerator.java
+++ b/java/org/apache/catalina/util/StandardSessionIdGenerator.java
@@ -37,14 +37,16 @@ public class StandardSessionIdGenerator extends SessionIdGeneratorBase {
j++) {
byte b1 = (byte) ((random[j] & 0xf0) >> 4);
byte b2 = (byte) (random[j] & 0x0f);
- if (b1 < 10)
+ if (b1 < 10) {
buffer.append((char) ('0' + b1));
- else
+ } else {
buffer.append((char) ('A' + (b1 - 10)));
- if (b2 < 10)
+ }
+ if (b2 < 10) {
buffer.append((char) ('0' + b2));
- else
+ } else {
buffer.append((char) ('A' + (b2 - 10)));
+ }
resultLenBytes++;
}
}
diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java
index c83b22a..002b0c0 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -1146,7 +1146,9 @@ public abstract class AbstractProtocol<S> implements ProtocolHandler,
size.incrementAndGet();
}
}
- if (!result) handler.unregister(processor);
+ if (!result) {
+ handler.unregister(processor);
+ }
return result;
}
diff --git a/java/org/apache/coyote/RequestGroupInfo.java b/java/org/apache/coyote/RequestGroupInfo.java
index c5568b1..bdc9c08 100644
--- a/java/org/apache/coyote/RequestGroupInfo.java
+++ b/java/org/apache/coyote/RequestGroupInfo.java
@@ -37,8 +37,9 @@ public class RequestGroupInfo {
public synchronized void removeRequestProcessor( RequestInfo rp ) {
if( rp != null ) {
- if( deadMaxTime < rp.getMaxTime() )
+ if( deadMaxTime < rp.getMaxTime() ) {
deadMaxTime = rp.getMaxTime();
+ }
deadProcessingTime += rp.getProcessingTime();
deadRequestCount += rp.getRequestCount();
deadErrorCount += rp.getErrorCount();
diff --git a/java/org/apache/coyote/Response.java b/java/org/apache/coyote/Response.java
index 7080a52..d25d570 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -358,8 +358,9 @@ public final class Response {
public void setHeader(String name, String value) {
char cc=name.charAt(0);
if( cc=='C' || cc=='c' ) {
- if( checkSpecialHeader(name, value) )
- return;
+ if( checkSpecialHeader(name, value) ) {
+ return;
+ }
}
headers.setValue(name).setString( value);
}
@@ -373,8 +374,9 @@ public final class Response {
public void addHeader(String name, String value, Charset charset) {
char cc=name.charAt(0);
if( cc=='C' || cc=='c' ) {
- if( checkSpecialHeader(name, value) )
- return;
+ if( checkSpecialHeader(name, value) ) {
+ return;
+ }
}
MessageBytes mb = headers.addValue(name);
if (charset != null) {
diff --git a/java/org/apache/coyote/ajp/AjpMessage.java b/java/org/apache/coyote/ajp/AjpMessage.java
index 9c93a59..3560305 100644
--- a/java/org/apache/coyote/ajp/AjpMessage.java
+++ b/java/org/apache/coyote/ajp/AjpMessage.java
@@ -371,10 +371,12 @@ public class AjpMessage {
log.debug(prefix + ": " + HexUtils.toHexString(buf) + " " + pos +"/" + (len + 4));
}
int max = pos;
- if (len + 4 > pos)
+ if (len + 4 > pos) {
max = len+4;
- if (max > 1000)
+ }
+ if (max > 1000) {
max = 1000;
+ }
if (log.isDebugEnabled()) {
for (int j = 0; j < max; j += 16) {
log.debug(hexLine(buf, j, len));
diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java b/java/org/apache/coyote/ajp/AjpProcessor.java
index 1256815..f656b45 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -1151,8 +1151,9 @@ public class AjpProcessor extends AbstractProcessor {
*/
@Override
protected final void finishResponse() throws IOException {
- if (responseFinished)
+ if (responseFinished) {
return;
+ }
responseFinished = true;
diff --git a/java/org/apache/coyote/ajp/Constants.java b/java/org/apache/coyote/ajp/Constants.java
index 245404b..355c765 100644
--- a/java/org/apache/coyote/ajp/Constants.java
+++ b/java/org/apache/coyote/ajp/Constants.java
@@ -232,9 +232,10 @@ public final class Constants {
public static final int getResponseAjpIndex(String header)
{
Integer i = responseTransHash.get(header);
- if (i == null)
+ if (i == null) {
return 0;
- else
+ } else {
return i.intValue();
+ }
}
}
diff --git a/java/org/apache/coyote/http11/Http11InputBuffer.java b/java/org/apache/coyote/http11/Http11InputBuffer.java
index c50b4d1..fd79100 100644
--- a/java/org/apache/coyote/http11/Http11InputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11InputBuffer.java
@@ -218,8 +218,9 @@ public class Http11InputBuffer implements InputBuffer, ApplicationBufferHandler
filter.setBuffer(inputStreamInputBuffer);
} else {
for (int i = 0; i <= lastActiveFilter; i++) {
- if (activeFilters[i] == filter)
+ if (activeFilters[i] == filter) {
return;
+ }
}
filter.setBuffer(activeFilters[lastActiveFilter]);
}
@@ -413,8 +414,9 @@ public class Http11InputBuffer implements InputBuffer, ApplicationBufferHandler
while (!space) {
// Read new bytes if needed
if (byteBuffer.position() >= byteBuffer.limit()) {
- if (!fill(false)) // request line parsing
+ if (!fill(false)) {
return false;
+ }
}
// Spec says method name is a token followed by a single SP but
// also be tolerant of multiple SP and/or HT.
@@ -439,8 +441,9 @@ public class Http11InputBuffer implements InputBuffer, ApplicationBufferHandler
while (space) {
// Read new bytes if needed
if (byteBuffer.position() >= byteBuffer.limit()) {
- if (!fill(false)) // request line parsing
+ if (!fill(false)) {
return false;
+ }
}
chr = byteBuffer.get();
if (!(chr == Constants.SP || chr == Constants.HT)) {
@@ -462,8 +465,9 @@ public class Http11InputBuffer implements InputBuffer, ApplicationBufferHandler
while (!space) {
// Read new bytes if needed
if (byteBuffer.position() >= byteBuffer.limit()) {
- if (!fill(false)) // request line parsing
+ if (!fill(false)) {
return false;
+ }
}
int pos = byteBuffer.position();
prevChr = chr;
@@ -533,8 +537,9 @@ public class Http11InputBuffer implements InputBuffer, ApplicationBufferHandler
while (space) {
// Read new bytes if needed
if (byteBuffer.position() >= byteBuffer.limit()) {
- if (!fill(false)) // request line parsing
+ if (!fill(false)) {
return false;
+ }
}
byte chr = byteBuffer.get();
if (!(chr == Constants.SP || chr == Constants.HT)) {
@@ -556,8 +561,9 @@ public class Http11InputBuffer implements InputBuffer, ApplicationBufferHandler
while (!parsingRequestLineEol) {
// Read new bytes if needed
if (byteBuffer.position() >= byteBuffer.limit()) {
- if (!fill(false)) // request line parsing
+ if (!fill(false)) {
return false;
+ }
}
int pos = byteBuffer.position();
@@ -1185,8 +1191,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/Http11OutputBuffer.java b/java/org/apache/coyote/http11/Http11OutputBuffer.java
index 287e226..1c3f7a9 100644
--- a/java/org/apache/coyote/http11/Http11OutputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11OutputBuffer.java
@@ -175,8 +175,9 @@ public class Http11OutputBuffer implements HttpOutputBuffer {
filter.setBuffer(outputStreamOutputBuffer);
} else {
for (int i = 0; i <= lastActiveFilter; i++) {
- if (activeFilters[i] == filter)
+ if (activeFilters[i] == filter) {
return;
+ }
}
filter.setBuffer(activeFilters[lastActiveFilter]);
}
diff --git a/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java b/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
index b22a0d3..a614f96 100644
--- a/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
@@ -395,8 +395,9 @@ public class ChunkedInputFilter implements InputFilter, ApplicationBufferHandler
while (!eol) {
if (readChunk == null || readChunk.position() >= readChunk.limit()) {
- if (readBytes() <= 0)
+ if (readBytes() <= 0) {
return false;
+ }
}
byte chr = readChunk.get(readChunk.position());
diff --git a/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java b/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
index ccc4623..01dd0ec 100644
--- a/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
@@ -72,8 +72,9 @@ public class SavedRequestInputFilter implements InputFilter {
@Override
public int doRead(ApplicationBufferHandler handler) throws IOException {
- if(input.getOffset()>= input.getEnd())
+ if(input.getOffset()>= input.getEnd()) {
return -1;
+ }
ByteBuffer byteBuffer = handler.getByteBuffer();
byteBuffer.position(byteBuffer.limit()).limit(byteBuffer.capacity());
diff --git a/java/org/apache/coyote/http2/HPackHuffman.java b/java/org/apache/coyote/http2/HPackHuffman.java
index cda063c..1bdc9a0 100644
--- a/java/org/apache/coyote/http2/HPackHuffman.java
+++ b/java/org/apache/coyote/http2/HPackHuffman.java
@@ -555,13 +555,21 @@ public class HPackHuffman {
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
HuffmanCode that = (HuffmanCode) o;
- if (length != that.length) return false;
- if (value != that.value) return false;
+ if (length != that.length) {
+ return false;
+ }
+ if (value != that.value) {
+ return false;
+ }
return true;
}
diff --git a/java/org/apache/el/lang/ELArithmetic.java b/java/org/apache/el/lang/ELArithmetic.java
index cff8d69..228e6a5 100644
--- a/java/org/apache/el/lang/ELArithmetic.java
+++ b/java/org/apache/el/lang/ELArithmetic.java
@@ -39,10 +39,12 @@ public abstract class ELArithmetic {
@Override
protected Number coerce(Number num) {
- if (num instanceof BigDecimal)
+ if (num instanceof BigDecimal) {
return num;
- if (num instanceof BigInteger)
+ }
+ if (num instanceof BigInteger) {
return new BigDecimal((BigInteger) num);
+ }
return new BigDecimal(num.doubleValue());
}
@@ -87,8 +89,9 @@ public abstract class ELArithmetic {
@Override
protected Number coerce(Number num) {
- if (num instanceof BigInteger)
+ if (num instanceof BigInteger) {
return num;
+ }
return new BigInteger(num.toString());
}
@@ -138,10 +141,12 @@ public abstract class ELArithmetic {
@Override
protected Number coerce(Number num) {
- if (num instanceof Double)
+ if (num instanceof Double) {
return num;
- if (num instanceof BigInteger)
+ }
+ if (num instanceof BigInteger) {
return new BigDecimal((BigInteger) num);
+ }
return Double.valueOf(num.doubleValue());
}
@@ -203,8 +208,9 @@ public abstract class ELArithmetic {
@Override
protected Number coerce(Number num) {
- if (num instanceof Long)
+ if (num instanceof Long) {
return num;
+ }
return Long.valueOf(num.longValue());
}
@@ -267,14 +273,15 @@ public abstract class ELArithmetic {
}
final ELArithmetic delegate;
- if (BIGDECIMAL.matches(obj0, obj1))
+ if (BIGDECIMAL.matches(obj0, obj1)) {
delegate = DOUBLE;
- else if (DOUBLE.matches(obj0, obj1))
+ } else if (DOUBLE.matches(obj0, obj1)) {
delegate = DOUBLE;
- else if (BIGINTEGER.matches(obj0, obj1))
+ } else if (BIGINTEGER.matches(obj0, obj1)) {
delegate = BIGINTEGER;
- else
+ } else {
delegate = LONG;
+ }
Number num0 = delegate.coerce(obj0);
Number num1 = delegate.coerce(obj1);
@@ -300,12 +307,13 @@ public abstract class ELArithmetic {
}
final ELArithmetic delegate;
- if (BIGDECIMAL.matches(obj0, obj1))
+ if (BIGDECIMAL.matches(obj0, obj1)) {
delegate = BIGDECIMAL;
- else if (BIGINTEGER.matches(obj0, obj1))
+ } else if (BIGINTEGER.matches(obj0, obj1)) {
delegate = BIGDECIMAL;
- else
+ } else {
delegate = DOUBLE;
+ }
Number num0 = delegate.coerce(obj0);
Number num1 = delegate.coerce(obj1);
diff --git a/java/org/apache/el/lang/ExpressionBuilder.java b/java/org/apache/el/lang/ExpressionBuilder.java
index 6c3620b..f383bcc 100644
--- a/java/org/apache/el/lang/ExpressionBuilder.java
+++ b/java/org/apache/el/lang/ExpressionBuilder.java
@@ -126,11 +126,12 @@ public final class ExpressionBuilder implements NodeVisitor {
Node child = null;
for (int i = 0; i < numChildren; i++) {
child = n.jjtGetChild(i);
- if (child instanceof AstLiteralExpression)
+ if (child instanceof AstLiteralExpression) {
continue;
- if (type == null)
+ }
+ if (type == null) {
type = child.getClass();
- else {
+ } else {
if (!type.equals(child.getClass())) {
throw new ELException(MessageFactory.get(
"error.mixed", expr));
diff --git a/java/org/apache/el/lang/FunctionMapperImpl.java b/java/org/apache/el/lang/FunctionMapperImpl.java
index 7ca71b4..dc7ff0a 100644
--- a/java/org/apache/el/lang/FunctionMapperImpl.java
+++ b/java/org/apache/el/lang/FunctionMapperImpl.java
@@ -146,7 +146,9 @@ public class FunctionMapperImpl extends FunctionMapper implements
ClassNotFoundException {
this.prefix = in.readUTF();
- if (this.prefix.isEmpty()) this.prefix = null;
+ if (this.prefix.isEmpty()) {
+ this.prefix = null;
+ }
this.localName = in.readUTF();
this.owner = in.readUTF();
this.name = in.readUTF();
diff --git a/java/org/apache/el/util/ReflectionUtil.java b/java/org/apache/el/util/ReflectionUtil.java
index e4327ba..03ae766 100644
--- a/java/org/apache/el/util/ReflectionUtil.java
+++ b/java/org/apache/el/util/ReflectionUtil.java
@@ -87,8 +87,9 @@ public class ReflectionUtil {
* @throws ClassNotFoundException If a class of a given name cannot be found
*/
public static Class<?>[] toTypeArray(String[] s) throws ClassNotFoundException {
- if (s == null)
+ if (s == null) {
return null;
+ }
Class<?>[] c = new Class[s.length];
for (int i = 0; i < s.length; i++) {
c[i] = forName(s[i]);
@@ -103,8 +104,9 @@ public class ReflectionUtil {
* result is the name of the class instance at index i in the input
*/
public static String[] toTypeNameArray(Class<?>[] c) {
- if (c == null)
+ if (c == null) {
return null;
+ }
String[] s = new String[c.length];
for (int i = 0; i < c.length; i++) {
s[i] = c[i].getName();
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java b/java/org/apache/jasper/EmbeddedServletOptions.java
index 19d9bba..c393b7d 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -652,12 +652,14 @@ public final class EmbeddedServletOptions implements Options {
}
String ieClassId = config.getInitParameter("ieClassId");
- if (ieClassId != null)
+ if (ieClassId != null) {
this.ieClassId = ieClassId;
+ }
String classpath = config.getInitParameter("classpath");
- if (classpath != null)
+ if (classpath != null) {
this.classpath = classpath;
+ }
/*
* scratchdir
@@ -678,9 +680,10 @@ public final class EmbeddedServletOptions implements Options {
}
if (!(scratchDir.exists() && scratchDir.canRead() &&
- scratchDir.canWrite() && scratchDir.isDirectory()))
+ scratchDir.canWrite() && scratchDir.isDirectory())) {
log.fatal(Localizer.getMessage("jsp.error.bad.scratch.dir",
scratchDir.getAbsolutePath()));
+ }
this.compiler = config.getInitParameter("compiler");
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index 03f234f..d4dd329 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -815,8 +815,9 @@ public class JspC extends Task implements Options {
*/
@Override
public String getClassPath() {
- if( classPath != null )
+ if( classPath != null ) {
return classPath;
+ }
return System.getProperty("java.class.path");
}
@@ -1246,12 +1247,14 @@ public class JspC extends Task implements Options {
}
}
- if(!webXml2.delete() && log.isDebugEnabled())
+ if(!webXml2.delete() && log.isDebugEnabled()) {
log.debug(Localizer.getMessage("jspc.delete.fail",
webXml2.toString()));
+ }
- if (!(new File(webxmlFile)).delete() && log.isDebugEnabled())
+ if (!(new File(webxmlFile)).delete() && log.isDebugEnabled()) {
log.debug(Localizer.getMessage("jspc.delete.fail", webxmlFile));
+ }
}
@@ -1576,7 +1579,9 @@ public class JspC extends Task implements Options {
}
protected String nextFile() {
- if (fullstop) argPos++;
+ if (fullstop) {
+ argPos++;
+ }
if (argPos >= args.length) {
return null;
} else {
@@ -1730,7 +1735,9 @@ public class JspC extends Task implements Options {
String[] libs = webinfLib.list();
if (libs != null) {
for (String lib : libs) {
- if (lib.length() < 5) continue;
+ if (lib.length() < 5) {
+ continue;
+ }
String ext = lib.substring(lib.length() - 4);
if (!".jar".equalsIgnoreCase(ext)) {
if (".tld".equalsIgnoreCase(ext)) {
diff --git a/java/org/apache/jasper/compiler/AntCompiler.java b/java/org/apache/jasper/compiler/AntCompiler.java
index 0d0bcb4..96d6275 100644
--- a/java/org/apache/jasper/compiler/AntCompiler.java
+++ b/java/org/apache/jasper/compiler/AntCompiler.java
@@ -64,8 +64,9 @@ public class AntCompiler extends Compiler {
// Lazy eval - if we don't need to compile we probably don't need the project
protected Project getProject() {
- if (project != null)
+ if (project != null) {
return project;
+ }
// Initializing project
project = new Project();
@@ -79,8 +80,9 @@ public class AntCompiler extends Compiler {
}
if( options.getCompiler() != null ) {
- if( log.isDebugEnabled() )
+ if( log.isDebugEnabled() ) {
log.debug("Compiler " + options.getCompiler() );
+ }
project.setProperty("build.compiler", options.getCompiler() );
}
project.init();
diff --git a/java/org/apache/jasper/compiler/Collector.java b/java/org/apache/jasper/compiler/Collector.java
index cd0f38d..29d93c9 100644
--- a/java/org/apache/jasper/compiler/Collector.java
+++ b/java/org/apache/jasper/compiler/Collector.java
@@ -161,8 +161,9 @@ class Collector {
@Override
public void visit(Node.JspElement n) throws JasperException {
- if (n.getNameAttribute().isExpression())
+ if (n.getNameAttribute().isExpression()) {
scriptingElementSeen = true;
+ }
Node.JspAttribute[] attrs = n.getJspAttributes();
for (Node.JspAttribute attr : attrs) {
diff --git a/java/org/apache/jasper/compiler/Compiler.java b/java/org/apache/jasper/compiler/Compiler.java
index 02278b5..3c91341 100644
--- a/java/org/apache/jasper/compiler/Compiler.java
+++ b/java/org/apache/jasper/compiler/Compiler.java
@@ -533,9 +533,10 @@ public abstract class Compiler {
return true;
}
} catch (Exception e) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Problem accessing resource. Treat as outdated.",
e);
+ }
return true;
}
}
@@ -570,8 +571,9 @@ public abstract class Compiler {
try {
File javaFile = new File(ctxt.getServletJavaFileName());
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Deleting " + javaFile);
+ }
if (javaFile.exists()) {
if (!javaFile.delete()) {
log.warn(Localizer.getMessage(
@@ -589,8 +591,9 @@ public abstract class Compiler {
public void removeGeneratedClassFiles() {
try {
File classFile = new File(ctxt.getClassFileName());
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Deleting " + classFile);
+ }
if (classFile.exists()) {
if (!classFile.delete()) {
log.warn(Localizer.getMessage(
diff --git a/java/org/apache/jasper/compiler/ELParser.java b/java/org/apache/jasper/compiler/ELParser.java
index 3bcef5b..afae730 100644
--- a/java/org/apache/jasper/compiler/ELParser.java
+++ b/java/org/apache/jasper/compiler/ELParser.java
@@ -407,8 +407,9 @@ public class ELParser {
int start = index;
while (hasNextChar()) {
char c = expression.charAt(index);
- if (c > ' ')
+ if (c > ' ') {
break;
+ }
index++;
}
whiteSpace = expression.substring(start, index);
diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 32e37f7..d76c9b2 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -156,16 +156,17 @@ class Generator {
StringBuilder b = new StringBuilder();
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
- if (c == '"')
+ if (c == '"') {
b.append('\\').append('"');
- else if (c == '\\')
+ } else if (c == '\\') {
b.append('\\').append('\\');
- else if (c == '\n')
+ } else if (c == '\n') {
b.append('\\').append('n');
- else if (c == '\r')
+ } else if (c == '\r') {
b.append('\\').append('r');
- else
+ } else {
b.append(c);
+ }
}
return b.toString();
}
@@ -177,16 +178,17 @@ class Generator {
StringBuilder b = new StringBuilder();
b.append('\'');
- if (c == '\'')
+ if (c == '\'') {
b.append('\\').append('\'');
- else if (c == '\\')
+ } else if (c == '\\') {
b.append('\\').append('\\');
- else if (c == '\n')
+ } else if (c == '\n') {
b.append('\\').append('n');
- else if (c == '\r')
+ } else if (c == '\r') {
b.append('\\').append('r');
- else
+ } else {
b.append(c);
+ }
b.append('\'');
return b.toString();
}
@@ -230,8 +232,9 @@ class Generator {
}
String info = n.getAttributeValue("info");
- if (info == null)
+ if (info == null) {
return;
+ }
getServletInfoGenerated = true;
out.printil("public java.lang.String getServletInfo() {");
@@ -783,8 +786,9 @@ class Generator {
// Local variable declarations
out.printil("final javax.servlet.jsp.PageContext pageContext;");
- if (pageInfo.isSession())
+ if (pageInfo.isSession()) {
out.printil("javax.servlet.http.HttpSession session = null;");
+ }
if (pageInfo.isErrorPage()) {
out.printil("java.lang.Throwable exception = org.apache.jasper.runtime.JspRuntimeLibrary.getThrowable(request);");
@@ -830,8 +834,9 @@ class Generator {
out.printil("application = pageContext.getServletContext();");
out.printil("config = pageContext.getServletConfig();");
- if (pageInfo.isSession())
+ if (pageInfo.isSession()) {
out.printil("session = pageContext.getSession();");
+ }
out.printil("out = pageContext.getOut();");
out.printil("_jspx_out = out;");
out.println();
@@ -1245,7 +1250,9 @@ class Generator {
+ name + "\"), request);");
} else if (value == null) {
if (param == null)
+ {
param = property; // default to same as property
+ }
out.printil("org.apache.jasper.runtime.JspRuntimeLibrary.introspecthelper("
+ "_jspx_page_context.findAttribute(\""
+ name
@@ -1515,8 +1522,9 @@ class Generator {
* @return a string for the form 'attr = "value"'
*/
private String makeAttr(String attr, String value) {
- if (value == null)
+ if (value == null) {
return "";
+ }
return " " + attr + "=\"" + value + '\"';
}
@@ -1539,10 +1547,11 @@ class Generator {
public void visit(Node.ParamAction n) throws JasperException {
String name = n.getTextAttribute("name");
- if (name.equalsIgnoreCase("object"))
+ if (name.equalsIgnoreCase("object")) {
name = "java_object";
- else if (name.equalsIgnoreCase("type"))
+ } else if (name.equalsIgnoreCase("type")) {
name = "java_type";
+ }
n.setBeginJavaLine(out.getJavaLine());
// XXX - Fixed a bug here - value used to be output
@@ -1610,10 +1619,12 @@ class Generator {
}
}
- if (iepluginurl == null)
+ if (iepluginurl == null) {
iepluginurl = Constants.IE_PLUGIN_URL;
- if (nspluginurl == null)
+ }
+ if (nspluginurl == null) {
nspluginurl = Constants.NS_PLUGIN_URL;
+ }
n.setBeginJavaLine(out.getJavaLine());
@@ -1696,8 +1707,9 @@ class Generator {
/*
* generate a <param> for each <jsp:param> in the plugin body
*/
- if (n.getBody() != null)
+ if (n.getBody() != null) {
n.getBody().visit(new ParamVisitor(true));
+ }
/*
* Netscape style plugin part
@@ -1724,8 +1736,9 @@ class Generator {
/*
* Generate a 'attr = "value"' for each <jsp:param> in plugin body
*/
- if (n.getBody() != null)
+ if (n.getBody() != null) {
n.getBody().visit(new ParamVisitor(false));
+ }
out.printil("out.write(" + quote("/>") + ");");
out.printil("out.write(\"\\n\");");
@@ -2756,12 +2769,14 @@ class Generator {
if (varInfos.length > 0) {
for (VariableInfo varInfo : varInfos) {
- if (varInfo.getScope() != scope)
+ if (varInfo.getScope() != scope) {
continue;
+ }
// If the scripting variable has been declared, skip codes
// for saving and restoring it.
- if (declaredVariables.contains(varInfo))
+ if (declaredVariables.contains(varInfo)) {
continue;
+ }
String varName = varInfo.getVarName();
String tmpVarName = "_jspx_" + varName + "_"
+ n.getCustomNestingLevel();
@@ -2772,12 +2787,14 @@ class Generator {
}
} else {
for (TagVariableInfo tagVarInfo : tagVarInfos) {
- if (tagVarInfo.getScope() != scope)
+ if (tagVarInfo.getScope() != scope) {
continue;
+ }
// If the scripting variable has been declared, skip codes
// for saving and restoring it.
- if (declaredVariables.contains(tagVarInfo))
+ if (declaredVariables.contains(tagVarInfo)) {
continue;
+ }
String varName = tagVarInfo.getNameGiven();
if (varName == null) {
varName = n.getTagData().getAttributeString(
@@ -2828,12 +2845,14 @@ class Generator {
if (varInfos.length > 0) {
for (VariableInfo varInfo : varInfos) {
- if (varInfo.getScope() != scope)
+ if (varInfo.getScope() != scope) {
continue;
+ }
// If the scripting variable has been declared, skip codes
// for saving and restoring it.
- if (declaredVariables.contains(varInfo))
+ if (declaredVariables.contains(varInfo)) {
continue;
+ }
String varName = varInfo.getVarName();
String tmpVarName = "_jspx_" + varName + "_"
+ n.getCustomNestingLevel();
@@ -2844,12 +2863,14 @@ class Generator {
}
} else {
for (TagVariableInfo tagVarInfo : tagVarInfos) {
- if (tagVarInfo.getScope() != scope)
+ if (tagVarInfo.getScope() != scope) {
continue;
+ }
// If the scripting variable has been declared, skip codes
// for saving and restoring it.
- if (declaredVariables.contains(tagVarInfo))
+ if (declaredVariables.contains(tagVarInfo)) {
continue;
+ }
String varName = tagVarInfo.getNameGiven();
if (varName == null) {
varName = n.getTagData().getAttributeString(
@@ -3630,8 +3651,9 @@ class Generator {
// Tag-handler specific declarations
generateTagHandlerAttributes(tagInfo);
- if (tagInfo.hasDynamicAttributes())
+ if (tagInfo.hasDynamicAttributes()) {
generateSetDynamicAttribute();
+ }
// Methods here
genPreambleMethods();
@@ -4023,9 +4045,10 @@ class Generator {
if (propertyDescriptor.getWriteMethod() != null) {
methodMaps.put(propertyDescriptor.getName(), propertyDescriptor.getWriteMethod());
}
- if (propertyDescriptor.getPropertyEditorClass() != null)
+ if (propertyDescriptor.getPropertyEditorClass() != null) {
propertyEditorMaps.put(propertyDescriptor.getName(), propertyDescriptor
.getPropertyEditorClass());
+ }
}
} catch (IntrospectionException ie) {
// Likely unreachable code
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
index 510db1a..3441cd6 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -478,8 +478,9 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
StringBuilder classFileName = new StringBuilder(outputDir).append('/');
for (int j = 0;
j < compoundName.length; j++) {
- if (j > 0)
+ if (j > 0) {
classFileName.append('/');
+ }
classFileName.append(compoundName[j]);
}
byte[] bytes = classFile.getBytes();
diff --git a/java/org/apache/jasper/compiler/JspDocumentParser.java b/java/org/apache/jasper/compiler/JspDocumentParser.java
index b40ba76..f0893fe 100644
--- a/java/org/apache/jasper/compiler/JspDocumentParser.java
+++ b/java/org/apache/jasper/compiler/JspDocumentParser.java
@@ -593,10 +593,11 @@ class JspDocumentParser
startMark = new Mark(ctxt, path, line, column);
break;
}
- if (ch == '"')
+ if (ch == '"') {
doubleQ = !doubleQ;
- else if (ch == '\'')
+ } else if (ch == '\'') {
singleQ = !singleQ;
+ }
ttext.write(ch);
lastCh = ch;
@@ -1351,10 +1352,12 @@ class JspDocumentParser
Node n = body.getNode(i);
if (!(n instanceof Node.TemplateText)) {
String elemType = SCRIPTLET_ACTION;
- if (scriptingElem instanceof Node.Declaration)
+ if (scriptingElem instanceof Node.Declaration) {
elemType = DECLARATION_ACTION;
- if (scriptingElem instanceof Node.Expression)
+ }
+ if (scriptingElem instanceof Node.Expression) {
elemType = EXPRESSION_ACTION;
+ }
String msg =
Localizer.getMessage(
"jsp.error.parse.xml.scripting.invalid.body",
diff --git a/java/org/apache/jasper/compiler/JspReader.java b/java/org/apache/jasper/compiler/JspReader.java
index d191df0..c2c86ce 100644
--- a/java/org/apache/jasper/compiler/JspReader.java
+++ b/java/org/apache/jasper/compiler/JspReader.java
@@ -112,8 +112,9 @@ class JspReader {
try {
CharArrayWriter caw = new CharArrayWriter();
char buf[] = new char[1024];
- for (int i = 0 ; (i = reader.read(buf)) != -1 ;)
+ for (int i = 0 ; (i = reader.read(buf)) != -1 ;) {
caw.write(buf, 0, i);
+ }
caw.close();
current = new Mark(this, caw.toCharArray(), fname);
} catch (Throwable ex) {
@@ -152,8 +153,9 @@ class JspReader {
}
int nextChar() {
- if (!hasMoreInput())
+ if (!hasMoreInput()) {
return -1;
+ }
int ch = current.stream[current.cursor];
@@ -198,8 +200,9 @@ class JspReader {
* and the cursor point to next character.
*/
private Boolean indexOf(char c, Mark mark) {
- if (!hasMoreInput())
+ if (!hasMoreInput()) {
return null;
+ }
int end = current.stream.length;
int ch;
@@ -345,11 +348,13 @@ class JspReader {
boolean matchesETag(String tagName) {
Mark mark = mark();
- if (!matches("</" + tagName))
+ if (!matches("</" + tagName)) {
return false;
+ }
skipSpaces();
- if (nextChar() == '>')
+ if (nextChar() == '>') {
return true;
+ }
setCurrent(mark);
return false;
@@ -358,11 +363,13 @@ class JspReader {
boolean matchesETagWithoutLessThan(String tagName) {
Mark mark = mark();
- if (!matches("/" + tagName))
- return false;
+ if (!matches("/" + tagName)) {
+ return false;
+ }
skipSpaces();
- if (nextChar() == '>')
- return true;
+ if (nextChar() == '>') {
+ return true;
+ }
setCurrent(mark);
return false;
@@ -464,10 +471,11 @@ class JspReader {
skipELExpression();
} else if (ch == firstChar) {
for (int i = 1 ; i < limlen ; i++) {
- if (peekChar() == limit.charAt(i))
+ if (peekChar() == limit.charAt(i)) {
nextChar();
- else
+ } else {
continue skip;
+ }
}
return ret;
}
@@ -487,8 +495,9 @@ class JspReader {
Mark ret = skipUntil("</" + tag);
if (ret != null) {
skipSpaces();
- if (nextChar() != '>')
+ if (nextChar() != '>') {
ret = null;
+ }
}
return ret;
}
@@ -576,8 +585,9 @@ class JspReader {
ch = nextChar();
for (ch = nextChar(); ch != -1 && ch != endQuote;
ch = nextChar()) {
- if (ch == '\\')
+ if (ch == '\\') {
ch = nextChar();
+ }
StringBuilder.append((char) ch);
}
// Check end of quote, skip closing quote:
@@ -595,8 +605,9 @@ class JspReader {
// Take care of the quoting here.
if (ch == '\\') {
if (peekChar() == '"' || peekChar() == '\'' ||
- peekChar() == '>' || peekChar() == '%')
+ peekChar() == '>' || peekChar() == '%') {
ch = nextChar();
+ }
}
StringBuilder.append((char) ch);
} while (!isDelimiter());
diff --git a/java/org/apache/jasper/compiler/Node.java b/java/org/apache/jasper/compiler/Node.java
index 92b4a96..094e912 100644
--- a/java/org/apache/jasper/compiler/Node.java
+++ b/java/org/apache/jasper/compiler/Node.java
@@ -460,8 +460,9 @@ abstract class Node implements TagConstants {
// Figure out and set the parent root
Node r = parent;
- while ((r != null) && !(r instanceof Node.Root))
+ while ((r != null) && !(r instanceof Node.Root)) {
r = r.getParent();
+ }
parentRoot = (Node.Root) r;
}
diff --git a/java/org/apache/jasper/compiler/PageDataImpl.java b/java/org/apache/jasper/compiler/PageDataImpl.java
index 97f44dc..13b6770 100644
--- a/java/org/apache/jasper/compiler/PageDataImpl.java
+++ b/java/org/apache/jasper/compiler/PageDataImpl.java
@@ -665,7 +665,9 @@ class PageDataImpl extends PageData implements TagConstants {
* within the given text, so it can be included in a CDATA section.
*/
private String escapeCDATA(String text) {
- if( text==null ) return "";
+ if( text==null ) {
+ return "";
+ }
int len = text.length();
CharArrayWriter result = new CharArrayWriter(len);
for (int i=0; i<len; i++) {
diff --git a/java/org/apache/jasper/compiler/PageInfo.java b/java/org/apache/jasper/compiler/PageInfo.java
index ecc35fe..48779d6 100644
--- a/java/org/apache/jasper/compiler/PageInfo.java
+++ b/java/org/apache/jasper/compiler/PageInfo.java
@@ -133,8 +133,9 @@ class PageInfo {
* @return true if Id has been declared.
*/
public boolean isPluginDeclared(String id) {
- if (pluginDcls.contains(id))
+ if (pluginDcls.contains(id)) {
return true;
+ }
pluginDcls.add(id);
return false;
}
@@ -156,8 +157,9 @@ class PageInfo {
}
public void addDependant(String d, Long lastModified) {
- if (!dependants.containsKey(d) && !jspFile.equals(d))
- dependants.put(d, lastModified);
+ if (!dependants.containsKey(d) && !jspFile.equals(d)) {
+ dependants.put(d, lastModified);
+ }
}
public Map<String,Long> getDependants() {
@@ -380,10 +382,11 @@ class PageInfo {
throws JasperException {
if (!"java".equalsIgnoreCase(value)) {
- if (pagedir)
+ if (pagedir) {
err.jspError(n, "jsp.error.page.language.nonjava");
- else
+ } else {
err.jspError(n, "jsp.error.tag.language.nonjava");
+ }
}
language = value;
@@ -445,9 +448,9 @@ class PageInfo {
public void setBufferValue(String value, Node n, ErrorDispatcher err)
throws JasperException {
- if ("none".equalsIgnoreCase(value))
+ if ("none".equalsIgnoreCase(value)) {
buffer = 0;
- else {
+ } else {
if (value == null || !value.endsWith("kb")) {
if (n == null) {
err.jspError("jsp.error.page.invalid.buffer");
@@ -486,12 +489,13 @@ class PageInfo {
public void setSession(String value, Node n, ErrorDispatcher err)
throws JasperException {
- if ("true".equalsIgnoreCase(value))
+ if ("true".equalsIgnoreCase(value)) {
isSession = true;
- else if ("false".equalsIgnoreCase(value))
+ } else if ("false".equalsIgnoreCase(value)) {
isSession = false;
- else
+ } else {
err.jspError(n, "jsp.error.page.invalid.session");
+ }
session = value;
}
@@ -511,12 +515,13 @@ class PageInfo {
public void setAutoFlush(String value, Node n, ErrorDispatcher err)
throws JasperException {
- if ("true".equalsIgnoreCase(value))
+ if ("true".equalsIgnoreCase(value)) {
isAutoFlush = true;
- else if ("false".equalsIgnoreCase(value))
+ } else if ("false".equalsIgnoreCase(value)) {
isAutoFlush = false;
- else
+ } else {
err.jspError(n, "jsp.error.autoFlush.invalid");
+ }
autoFlush = value;
}
@@ -536,12 +541,13 @@ class PageInfo {
public void setIsThreadSafe(String value, Node n, ErrorDispatcher err)
throws JasperException {
- if ("true".equalsIgnoreCase(value))
+ if ("true".equalsIgnoreCase(value)) {
isThreadSafe = true;
- else if ("false".equalsIgnoreCase(value))
+ } else if ("false".equalsIgnoreCase(value)) {
isThreadSafe = false;
- else
+ } else {
err.jspError(n, "jsp.error.page.invalid.isthreadsafe");
+ }
isThreadSafeValue = value;
}
@@ -585,12 +591,13 @@ class PageInfo {
public void setIsErrorPage(String value, Node n, ErrorDispatcher err)
throws JasperException {
- if ("true".equalsIgnoreCase(value))
+ if ("true".equalsIgnoreCase(value)) {
isErrorPage = true;
- else if ("false".equalsIgnoreCase(value))
+ } else if ("false".equalsIgnoreCase(value)) {
isErrorPage = false;
- else
+ } else {
err.jspError(n, "jsp.error.page.invalid.iserrorpage");
+ }
isErrorPageValue = value;
}
@@ -611,15 +618,16 @@ class PageInfo {
boolean pagedir)
throws JasperException {
- if ("true".equalsIgnoreCase(value))
+ if ("true".equalsIgnoreCase(value)) {
isELIgnored = true;
- else if ("false".equalsIgnoreCase(value))
+ } else if ("false".equalsIgnoreCase(value)) {
isELIgnored = false;
- else {
- if (pagedir)
+ } else {
+ if (pagedir) {
err.jspError(n, "jsp.error.page.invalid.iselignored");
- else
+ } else {
err.jspError(n, "jsp.error.tag.invalid.iselignored");
+ }
}
isELIgnoredValue = value;
@@ -632,15 +640,16 @@ class PageInfo {
boolean pagedir)
throws JasperException {
- if ("true".equalsIgnoreCase(value))
+ if ("true".equalsIgnoreCase(value)) {
deferredSyntaxAllowedAsLiteral = true;
- else if ("false".equalsIgnoreCase(value))
+ } else if ("false".equalsIgnoreCase(value)) {
deferredSyntaxAllowedAsLiteral = false;
- else {
- if (pagedir)
+ } else {
+ if (pagedir) {
err.jspError(n, "jsp.error.page.invalid.deferredsyntaxallowedasliteral");
- else
+ } else {
err.jspError(n, "jsp.error.tag.invalid.deferredsyntaxallowedasliteral");
+ }
}
deferredSyntaxAllowedAsLiteralValue = value;
@@ -653,15 +662,16 @@ class PageInfo {
boolean pagedir)
throws JasperException {
- if ("true".equalsIgnoreCase(value))
+ if ("true".equalsIgnoreCase(value)) {
trimDirectiveWhitespaces = true;
- else if ("false".equalsIgnoreCase(value))
+ } else if ("false".equalsIgnoreCase(value)) {
trimDirectiveWhitespaces = false;
- else {
- if (pagedir)
+ } else {
+ if (pagedir) {
err.jspError(n, "jsp.error.page.invalid.trimdirectivewhitespaces");
- else
+ } else {
err.jspError(n, "jsp.error.tag.invalid.trimdirectivewhitespaces");
+ }
}
trimDirectiveWhitespacesValue = value;
diff --git a/java/org/apache/jasper/compiler/Parser.java b/java/org/apache/jasper/compiler/Parser.java
index 98eb9c2..a630aa4 100644
--- a/java/org/apache/jasper/compiler/Parser.java
+++ b/java/org/apache/jasper/compiler/Parser.java
@@ -208,8 +208,9 @@ class Parser implements TagConstants {
// Get the qualified name
String qName = parseName();
- if (qName == null)
+ if (qName == null) {
return false;
+ }
boolean ignoreEL = pageInfo.isELIgnored();
@@ -228,13 +229,15 @@ class Parser implements TagConstants {
}
reader.skipSpaces();
- if (!reader.matches("="))
+ if (!reader.matches("=")) {
err.jspError(reader.mark(), "jsp.error.attribute.noequal");
+ }
reader.skipSpaces();
char quote = (char) reader.nextChar();
- if (quote != '\'' && quote != '"')
+ if (quote != '\'' && quote != '"') {
err.jspError(reader.mark(), "jsp.error.attribute.noquote");
+ }
String watchString = "";
if (reader.matches("<%=")) {
@@ -302,8 +305,9 @@ class Parser implements TagConstants {
} catch (IllegalArgumentException iae) {
err.jspError(start, iae.getMessage());
}
- if (watch.length() == 1) // quote
+ if (watch.length() == 1) {
return ret;
+ }
// Put back delimiter '<%=' and '%>', since they are needed if the
// attribute does not allow RTexpression.
@@ -1303,8 +1307,9 @@ class Parser implements TagConstants {
*/
private void parseTemplateText(Node parent) {
- if (!reader.hasMoreInput())
+ if (!reader.hasMoreInput()) {
return;
+ }
CharArrayWriter ttext = new CharArrayWriter();
diff --git a/java/org/apache/jasper/compiler/ParserController.java b/java/org/apache/jasper/compiler/ParserController.java
index fcfe60d..79f3a92 100644
--- a/java/org/apache/jasper/compiler/ParserController.java
+++ b/java/org/apache/jasper/compiler/ParserController.java
@@ -545,7 +545,9 @@ class ParserController implements TagConstants {
Mark start = null;
while ((start = reader.skipUntil("<")) != null) {
int c = reader.nextChar();
- if (c != '!' && c != '?') break;
+ if (c != '!' && c != '?') {
+ break;
+ }
}
if (start == null) {
return false;
diff --git a/java/org/apache/jasper/compiler/ScriptingVariabler.java b/java/org/apache/jasper/compiler/ScriptingVariabler.java
index 59c2db9..4d43342 100644
--- a/java/org/apache/jasper/compiler/ScriptingVariabler.java
+++ b/java/org/apache/jasper/compiler/ScriptingVariabler.java
@@ -95,10 +95,11 @@ class ScriptingVariabler {
Node.CustomTag parent = n.getCustomTagParent();
if (scope == VariableInfo.AT_BEGIN
|| scope == VariableInfo.AT_END) {
- if (parent == null)
+ if (parent == null) {
ownRange = MAX_SCOPE;
- else
+ } else {
ownRange = parent.getNumCount();
+ }
} else {
// NESTED
ownRange = n.getNumCount();
diff --git a/java/org/apache/jasper/compiler/ServletWriter.java b/java/org/apache/jasper/compiler/ServletWriter.java
index b34b8cf..f5d3057 100644
--- a/java/org/apache/jasper/compiler/ServletWriter.java
+++ b/java/org/apache/jasper/compiler/ServletWriter.java
@@ -67,14 +67,16 @@ public class ServletWriter implements AutoCloseable {
public void pushIndent() {
virtual_indent += TAB_WIDTH;
- if (virtual_indent >= 0 && virtual_indent <= SPACES.length())
+ if (virtual_indent >= 0 && virtual_indent <= SPACES.length()) {
indent = virtual_indent;
+ }
}
public void popIndent() {
virtual_indent -= TAB_WIDTH;
- if (virtual_indent >= 0 && virtual_indent <= SPACES.length())
+ if (virtual_indent >= 0 && virtual_indent <= SPACES.length()) {
indent = virtual_indent;
+ }
}
/**
diff --git a/java/org/apache/jasper/compiler/SmapStratum.java b/java/org/apache/jasper/compiler/SmapStratum.java
index 6539940..95603d8 100644
--- a/java/org/apache/jasper/compiler/SmapStratum.java
+++ b/java/org/apache/jasper/compiler/SmapStratum.java
@@ -45,14 +45,16 @@ public class SmapStratum {
private boolean lineFileIDSet = false;
public void setInputStartLine(int inputStartLine) {
- if (inputStartLine < 0)
+ if (inputStartLine < 0) {
throw new IllegalArgumentException("" + inputStartLine);
+ }
this.inputStartLine = inputStartLine;
}
public void setOutputStartLine(int outputStartLine) {
- if (outputStartLine < 0)
+ if (outputStartLine < 0) {
throw new IllegalArgumentException("" + outputStartLine);
+ }
this.outputStartLine = outputStartLine;
}
@@ -65,21 +67,24 @@ public class SmapStratum {
* @param lineFileID The new line file ID
*/
public void setLineFileID(int lineFileID) {
- if (lineFileID < 0)
+ if (lineFileID < 0) {
throw new IllegalArgumentException("" + lineFileID);
+ }
this.lineFileID = lineFileID;
this.lineFileIDSet = true;
}
public void setInputLineCount(int inputLineCount) {
- if (inputLineCount < 0)
+ if (inputLineCount < 0) {
throw new IllegalArgumentException("" + inputLineCount);
+ }
this.inputLineCount = inputLineCount;
}
public void setOutputLineIncrement(int outputLineIncrement) {
- if (outputLineIncrement < 0)
+ if (outputLineIncrement < 0) {
throw new IllegalArgumentException("" + outputLineIncrement);
+ }
this.outputLineIncrement = outputLineIncrement;
}
@@ -89,17 +94,21 @@ public class SmapStratum {
* specified, as its necessity is sensitive to context).
*/
public String getString() {
- if (inputStartLine == -1 || outputStartLine == -1)
+ if (inputStartLine == -1 || outputStartLine == -1) {
throw new IllegalStateException();
+ }
StringBuilder out = new StringBuilder();
out.append(inputStartLine);
- if (lineFileIDSet)
+ if (lineFileIDSet) {
out.append("#" + lineFileID);
- if (inputLineCount != 1)
+ }
+ if (inputLineCount != 1) {
out.append("," + inputLineCount);
+ }
out.append(":" + outputStartLine);
- if (outputLineIncrement != 1)
+ if (outputLineIncrement != 1) {
out.append("," + outputLineIncrement);
+ }
out.append('\n');
return out.toString();
}
@@ -259,17 +268,19 @@ public class SmapStratum {
int outputLineIncrement) {
// check the input - what are you doing here??
int fileIndex = filePathList.indexOf(inputFileName);
- if (fileIndex == -1) // still
+ if (fileIndex == -1) {
throw new IllegalArgumentException(
"inputFileName: " + inputFileName);
+ }
//Jasper incorrectly SMAPs certain Nodes, giving them an
//outputStartLine of 0. This can cause a fatal error in
//optimizeLineSection, making it impossible for Jasper to
//compile the JSP. Until we can fix the underlying
//SMAPping problem, we simply ignore the flawed SMAP entries.
- if (outputStartLine == 0)
+ if (outputStartLine == 0) {
return;
+ }
// build the LineInfo
LineInfo li = new LineInfo();
@@ -277,8 +288,9 @@ public class SmapStratum {
li.setInputLineCount(inputLineCount);
li.setOutputStartLine(outputStartLine);
li.setOutputLineIncrement(outputLineIncrement);
- if (fileIndex != lastFileID)
+ if (fileIndex != lastFileID) {
li.setLineFileID(fileIndex);
+ }
lastFileID = fileIndex;
// save it
@@ -304,8 +316,9 @@ public class SmapStratum {
*/
public String getString() {
// check state and initialize buffer
- if (fileNameList.size() == 0 || lineData.size() == 0)
+ if (fileNameList.size() == 0 || lineData.size() == 0) {
return null;
+ }
StringBuilder out = new StringBuilder();
diff --git a/java/org/apache/jasper/compiler/SmapUtil.java b/java/org/apache/jasper/compiler/SmapUtil.java
index 791ca1e..78980be 100644
--- a/java/org/apache/jasper/compiler/SmapUtil.java
+++ b/java/org/apache/jasper/compiler/SmapUtil.java
@@ -244,8 +244,9 @@ public class SmapUtil {
copy(4 + 2 + 2); // magic min/maj version
int constantPoolCountPos = genPos;
int constantPoolCount = readU2();
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("constant pool count: " + constantPoolCount);
+ }
writeU2(constantPoolCount);
// copy old constant pool return index of SDE symbol, if found
@@ -259,32 +260,37 @@ public class SmapUtil {
++constantPoolCount;
randomAccessWriteU2(constantPoolCountPos, constantPoolCount);
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("SourceDebugExtension not found, installed at: " + sdeIndex);
+ }
} else {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("SourceDebugExtension found at: " + sdeIndex);
+ }
}
copy(2 + 2 + 2); // access, this, super
int interfaceCount = readU2();
writeU2(interfaceCount);
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("interfaceCount: " + interfaceCount);
+ }
copy(interfaceCount * 2);
copyMembers(); // fields
copyMembers(); // methods
int attrCountPos = genPos;
int attrCount = readU2();
writeU2(attrCount);
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("class attrCount: " + attrCount);
+ }
// copy the class attributes, return true if SDE attr found (not copied)
if (!copyAttrs(attrCount)) {
// we will be adding SDE and it isn't already counted
++attrCount;
randomAccessWriteU2(attrCountPos, attrCount);
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("class attrCount incremented");
+ }
}
writeAttrForSDE(sdeIndex);
}
@@ -292,14 +298,16 @@ public class SmapUtil {
void copyMembers() {
int count = readU2();
writeU2(count);
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("members count: " + count);
+ }
for (int i = 0; i < count; ++i) {
copy(6); // access, name, descriptor
int attrCount = readU2();
writeU2(attrCount);
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("member attr count: " + attrCount);
+ }
copyAttrs(attrCount);
}
}
@@ -311,15 +319,17 @@ public class SmapUtil {
// don't write old SDE
if (nameIndex == sdeIndex) {
sdeFound = true;
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("SDE attr found");
+ }
} else {
writeU2(nameIndex); // name
int len = readU4();
writeU4(len);
copy(len);
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("attr len: " + len);
+ }
}
}
return sdeFound;
@@ -399,13 +409,15 @@ public class SmapUtil {
case 7 : // Class
case 8 : // String
case 16 : // MethodType
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(i + " copying 2 bytes");
+ }
copy(2);
break;
case 15 : // MethodHandle
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(i + " copying 3 bytes");
+ }
copy(3);
break;
case 9 : // Field
@@ -415,14 +427,16 @@ public class SmapUtil {
case 4 : // Float
case 12 : // NameAndType
case 18 : // InvokeDynamic
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(i + " copying 4 bytes");
+ }
copy(4);
break;
case 5 : // Long
case 6 : // Double
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(i + " copying 8 bytes");
+ }
copy(8);
i++;
break;
@@ -431,8 +445,9 @@ public class SmapUtil {
writeU2(len);
byte[] utf8 = readBytes(len);
String str = new String(utf8, "UTF-8");
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(i + " read class attr -- '" + str + "'");
+ }
if (str.equals(nameSDE)) {
sdeIndex = i;
}
diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java b/java/org/apache/jasper/compiler/TagFileProcessor.java
index 7be773d..d76d433 100644
--- a/java/org/apache/jasper/compiler/TagFileProcessor.java
+++ b/java/org/apache/jasper/compiler/TagFileProcessor.java
@@ -262,8 +262,9 @@ class TagFileProcessor {
err.jspError(n, "jsp.error.frgmentwithrtexprvalue");
}
} else {
- if (type == null)
+ if (type == null) {
type = "java.lang.String";
+ }
if (deferredValue) {
type = ValueExpression.class.getName();
@@ -309,13 +310,15 @@ class TagFileProcessor {
}
String className = n.getAttributeValue("variable-class");
- if (className == null)
+ if (className == null) {
className = "java.lang.String";
+ }
String declareStr = n.getAttributeValue("declare");
boolean declare = true;
- if (declareStr != null)
+ if (declareStr != null) {
declare = JspUtil.booleanValue(declareStr);
+ }
int scope = VariableInfo.NESTED;
String scopeStr = n.getAttributeValue("scope");
diff --git a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
index 78da6d4..b4d62dc 100644
--- a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
+++ b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
@@ -386,8 +386,9 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants {
*/
public ValidationMessage[] validate(PageData thePage) {
TagLibraryValidator tlv = getTagLibraryValidator();
- if (tlv == null)
+ if (tlv == null) {
return null;
+ }
String uri = getURI();
if (uri.startsWith("/")) {
diff --git a/java/org/apache/jasper/compiler/TagPluginManager.java b/java/org/apache/jasper/compiler/TagPluginManager.java
index b1ae5dc..99bc223 100644
--- a/java/org/apache/jasper/compiler/TagPluginManager.java
+++ b/java/org/apache/jasper/compiler/TagPluginManager.java
@@ -62,8 +62,9 @@ public class TagPluginManager {
}
private void init(ErrorDispatcher err) throws JasperException {
- if (initialized)
+ if (initialized) {
return;
+ }
String blockExternalString = ctxt.getInitParameter(
Constants.XML_BLOCK_EXTERNAL_INIT_PARAM);
@@ -209,16 +210,18 @@ public class TagPluginManager {
@Override
public boolean isConstantAttribute(String attribute) {
Node.JspAttribute attr = getNodeAttribute(attribute);
- if (attr == null)
+ if (attr == null) {
return false;
+ }
return attr.isLiteral();
}
@Override
public String getConstantAttribute(String attribute) {
Node.JspAttribute attr = getNodeAttribute(attribute);
- if (attr == null)
+ if (attr == null) {
return null;
+ }
return attr.getValue();
}
diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
index 7805cd6..36107ba 100644
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -197,8 +197,9 @@ class Validator {
pageInfo.getInfo(), value);
}
} else if ("pageEncoding".equals(attr)) {
- if (pageEncodingSeen)
+ if (pageEncodingSeen) {
err.jspError(n, "jsp.error.page.multi.pageencoding");
+ }
// 'pageEncoding' can occur at most once per file
pageEncodingSeen = true;
String actual = comparePageEncodings(value, n);
@@ -234,8 +235,9 @@ class Validator {
}
// Check for bad combinations
- if (pageInfo.getBuffer() == 0 && !pageInfo.isAutoFlush())
+ if (pageInfo.getBuffer() == 0 && !pageInfo.isAutoFlush()) {
err.jspError(n, "jsp.error.page.badCombo");
+ }
// Attributes for imports for this node have been processed by
// the parsers, just add them to pageInfo.
@@ -270,8 +272,9 @@ class Validator {
pageInfo.getIsELIgnored(), value);
}
} else if ("pageEncoding".equals(attr)) {
- if (pageEncodingSeen)
+ if (pageEncodingSeen) {
err.jspError(n, "jsp.error.tag.multi.pageencoding");
+ }
pageEncodingSeen = true;
compareTagEncodings(value, n);
n.getRoot().setPageEncoding(value);
@@ -619,8 +622,9 @@ class Validator {
boolean valueSpecified = n.getValue() != null;
if ("*".equals(property)) {
- if (param != null || valueSpecified)
+ if (param != null || valueSpecified) {
err.jspError(n, "jsp.error.setProperty.invalid");
+ }
} else if (param != null && valueSpecified) {
err.jspError(n, "jsp.error.setProperty.invalid");
@@ -640,23 +644,28 @@ class Validator {
String type = n.getTextAttribute("type");
BeanRepository beanInfo = pageInfo.getBeanRepository();
- if (className == null && type == null)
+ if (className == null && type == null) {
err.jspError(n, "jsp.error.usebean.missingType");
+ }
- if (beanInfo.checkVariable(name))
+ if (beanInfo.checkVariable(name)) {
err.jspError(n, "jsp.error.usebean.duplicate");
+ }
- if ("session".equals(scope) && !pageInfo.isSession())
+ if ("session".equals(scope) && !pageInfo.isSession()) {
err.jspError(n, "jsp.error.usebean.noSession");
+ }
Node.JspAttribute jattr = getJspAttribute(null, "beanName", null,
null, n.getAttributeValue("beanName"), n, null, false);
n.setBeanName(jattr);
- if (className != null && jattr != null)
+ if (className != null && jattr != null) {
err.jspError(n, "jsp.error.usebean.notBoth");
+ }
- if (className == null)
+ if (className == null) {
className = type;
+ }
beanInfo.addBean(n, name, className, scope);
@@ -681,12 +690,15 @@ class Validator {
throwErrorIfExpression(n, "iepluginurl", "jsp:plugin");
String type = n.getTextAttribute("type");
- if (type == null)
+ if (type == null) {
err.jspError(n, "jsp.error.plugin.notype");
- if (!type.equals("bean") && !type.equals("applet"))
+ }
+ if (!type.equals("bean") && !type.equals("applet")) {
err.jspError(n, "jsp.error.plugin.badtype");
- if (n.getTextAttribute("code") == null)
+ }
+ if (n.getTextAttribute("code") == null) {
err.jspError(n, "jsp.error.plugin.nocode");
+ }
Node.JspAttribute width = getJspAttribute(null, "width", null,
null, n.getAttributeValue("width"), n, null, false);
@@ -736,8 +748,9 @@ class Validator {
@Override
public void visit(Node.ELExpression n) throws JasperException {
// exit if we are ignoring EL all together
- if (pageInfo.isELIgnored())
+ if (pageInfo.isELIgnored()) {
return;
+ }
// JSP.2.2 - '#{' not allowed in template text
if (n.getType() == '#') {
@@ -1885,8 +1898,9 @@ class Validator {
for (Object o : compiler.getPageInfo().getTaglibs()) {
- if (!(o instanceof TagLibraryInfoImpl))
+ if (!(o instanceof TagLibraryInfoImpl)) {
continue;
+ }
TagLibraryInfoImpl tli = (TagLibraryInfoImpl) o;
ValidationMessage[] errors = tli.validate(xmlView);
diff --git a/java/org/apache/jasper/el/ELContextWrapper.java b/java/org/apache/jasper/el/ELContextWrapper.java
index 8c18293..4800ec6 100644
--- a/java/org/apache/jasper/el/ELContextWrapper.java
+++ b/java/org/apache/jasper/el/ELContextWrapper.java
@@ -45,7 +45,9 @@ public final class ELContextWrapper extends ELContext {
@Override
public FunctionMapper getFunctionMapper() {
- if (this.fnMapper != null) return this.fnMapper;
+ if (this.fnMapper != null) {
+ return this.fnMapper;
+ }
return this.target.getFunctionMapper();
}
diff --git a/java/org/apache/jasper/el/JspMethodExpression.java b/java/org/apache/jasper/el/JspMethodExpression.java
index ca6a384..c6f9fb4 100644
--- a/java/org/apache/jasper/el/JspMethodExpression.java
+++ b/java/org/apache/jasper/el/JspMethodExpression.java
@@ -54,13 +54,19 @@ public final class JspMethodExpression extends MethodExpression implements
context.notifyAfterEvaluation(getExpressionString());
return result;
} catch (MethodNotFoundException e) {
- if (e instanceof JspMethodNotFoundException) throw e;
+ if (e instanceof JspMethodNotFoundException) {
+ throw e;
+ }
throw new JspMethodNotFoundException(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);
}
}
@@ -75,13 +81,19 @@ public final class JspMethodExpression extends MethodExpression implements
context.notifyAfterEvaluation(getExpressionString());
return result;
} catch (MethodNotFoundException e) {
- if (e instanceof JspMethodNotFoundException) throw e;
+ if (e instanceof JspMethodNotFoundException) {
+ throw e;
+ }
throw new JspMethodNotFoundException(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);
}
}
diff --git a/java/org/apache/jasper/runtime/BodyContentImpl.java b/java/org/apache/jasper/runtime/BodyContentImpl.java
index 0f3c11a..b368fa5 100644
--- a/java/org/apache/jasper/runtime/BodyContentImpl.java
+++ b/java/org/apache/jasper/runtime/BodyContentImpl.java
@@ -146,8 +146,9 @@ public class BodyContentImpl extends BodyContent {
return;
}
- if (len >= bufferSize - nextChar)
+ if (len >= bufferSize - nextChar) {
reAllocBuff (len);
+ }
System.arraycopy(cbuf, off, cb, nextChar, len);
nextChar+=len;
@@ -183,8 +184,9 @@ public class BodyContentImpl extends BodyContent {
writer.write(s, off, len);
} else {
ensureOpen();
- if (len >= bufferSize - nextChar)
+ if (len >= bufferSize - nextChar) {
reAllocBuff(len);
+ }
s.getChars(off, off + len, cb, nextChar);
nextChar += len;
@@ -367,7 +369,9 @@ public class BodyContentImpl extends BodyContent {
*/
@Override
public void print(String s) throws IOException {
- if (s == null) s = "null";
+ if (s == null) {
+ s = "null";
+ }
if (writer != null) {
writer.write(s);
} else {
diff --git a/java/org/apache/jasper/runtime/JspFactoryImpl.java b/java/org/apache/jasper/runtime/JspFactoryImpl.java
index 7f05c82..3d28bbb 100644
--- a/java/org/apache/jasper/runtime/JspFactoryImpl.java
+++ b/java/org/apache/jasper/runtime/JspFactoryImpl.java
@@ -64,8 +64,9 @@ public class JspFactoryImpl extends JspFactory {
@Override
public void releasePageContext(PageContext pc) {
- if( pc == null )
+ if( pc == null ) {
return;
+ }
if( Constants.IS_SECURITY_ENABLED ) {
PrivilegedReleasePageContext dp = new PrivilegedReleasePageContext(
this,pc);
diff --git a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
index 0817a8f..f85642f 100644
--- a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
+++ b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
@@ -88,17 +88,19 @@ public class JspRuntimeLibrary {
}
public static boolean coerceToBoolean(String s) {
- if (s == null || s.length() == 0)
+ if (s == null || s.length() == 0) {
return false;
- else
+ } else {
return Boolean.parseBoolean(s);
+ }
}
public static byte coerceToByte(String s) {
- if (s == null || s.length() == 0)
+ if (s == null || s.length() == 0) {
return (byte) 0;
- else
+ } else {
return Byte.parseByte(s);
+ }
}
public static char coerceToChar(String s) {
@@ -110,38 +112,43 @@ public class JspRuntimeLibrary {
}
public static double coerceToDouble(String s) {
- if (s == null || s.length() == 0)
+ if (s == null || s.length() == 0) {
return 0;
- else
+ } else {
return Double.parseDouble(s);
+ }
}
public static float coerceToFloat(String s) {
- if (s == null || s.length() == 0)
+ if (s == null || s.length() == 0) {
return 0;
- else
+ } else {
return Float.parseFloat(s);
+ }
}
public static int coerceToInt(String s) {
- if (s == null || s.length() == 0)
+ if (s == null || s.length() == 0) {
return 0;
- else
+ } else {
return Integer.parseInt(s);
+ }
}
public static short coerceToShort(String s) {
- if (s == null || s.length() == 0)
+ if (s == null || s.length() == 0) {
return (short) 0;
- else
+ } else {
return Short.parseShort(s);
+ }
}
public static long coerceToLong(String s) {
- if (s == null || s.length() == 0)
+ if (s == null || s.length() == 0) {
return 0;
- else
+ } else {
return Long.parseLong(s);
+ }
}
public static Object coerce(String s, Class<?> target) {
@@ -154,43 +161,49 @@ public class JspRuntimeLibrary {
}
return Boolean.valueOf(s);
} else if (target == Byte.class) {
- if (isNullOrEmpty)
+ if (isNullOrEmpty) {
return Byte.valueOf((byte) 0);
- else
+ } else {
return Byte.valueOf(s);
+ }
} else if (target == Character.class) {
- if (isNullOrEmpty)
+ if (isNullOrEmpty) {
return Character.valueOf((char) 0);
- else {
+ } else {
@SuppressWarnings("null")
Character result = Character.valueOf(s.charAt(0));
return result;
}
} else if (target == Double.class) {
- if (isNullOrEmpty)
+ if (isNullOrEmpty) {
return Double.valueOf(0);
- else
+ } else {
return Double.valueOf(s);
+ }
} else if (target == Float.class) {
- if (isNullOrEmpty)
+ if (isNullOrEmpty) {
return Float.valueOf(0);
- else
+ } else {
return Float.valueOf(s);
+ }
} else if (target == Integer.class) {
- if (isNullOrEmpty)
+ if (isNullOrEmpty) {
return Integer.valueOf(0);
- else
+ } else {
return Integer.valueOf(s);
+ }
} else if (target == Short.class) {
- if (isNullOrEmpty)
+ if (isNullOrEmpty) {
return Short.valueOf((short) 0);
- else
+ } else {
return Short.valueOf(s);
+ }
} else if (target == Long.class) {
- if (isNullOrEmpty)
+ if (isNullOrEmpty) {
return Long.valueOf(0);
- else
+ } else {
return Long.valueOf(s);
+ }
} else {
return null;
}
@@ -203,10 +216,11 @@ public class JspRuntimeLibrary {
{
try {
if (s == null) {
- if (t.equals(Boolean.class) || t.equals(Boolean.TYPE))
+ if (t.equals(Boolean.class) || t.equals(Boolean.TYPE)) {
s = "false";
- else
+ } else {
return null;
+ }
}
if (propertyEditorClass != null) {
return getValueFromBeanInfoPropertyEditor(
@@ -290,7 +304,9 @@ public class JspRuntimeLibrary {
Class<?> t = type.getComponentType();
String[] values = request.getParameterValues(param);
//XXX Please check.
- if(values == null) return;
+ if(values == null) {
+ return;
+ }
if(t.equals(String.class)) {
method.invoke(bean, new Object[] { values });
} else {
@@ -298,10 +314,13 @@ public class JspRuntimeLibrary {
propertyEditorClass);
}
} else {
- if(value == null || (param != null && value.equals(""))) return;
+ if(value == null || (param != null && value.equals(""))) {
+ return;
+ }
Object oval = convert(prop, value, type, propertyEditorClass);
- if ( oval != null )
+ if ( oval != null ) {
method.invoke(bean, new Object[] { oval });
+ }
}
}
} catch (Exception ex) {
@@ -398,83 +417,99 @@ public class JspRuntimeLibrary {
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Integer.class)) {
Integer []tmpval = new Integer[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Integer.valueOf(values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Byte.class)) {
Byte[] tmpval = new Byte[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Byte.valueOf(values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Boolean.class)) {
Boolean[] tmpval = new Boolean[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Boolean.valueOf(values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Short.class)) {
Short[] tmpval = new Short[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Short.valueOf(values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Long.class)) {
Long[] tmpval = new Long[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Long.valueOf(values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Double.class)) {
Double[] tmpval = new Double[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Double.valueOf(values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Float.class)) {
Float[] tmpval = new Float[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Float.valueOf(values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(Character.class)) {
Character[] tmpval = new Character[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Character.valueOf(values[i].charAt(0));
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(int.class)) {
int []tmpval = new int[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Integer.parseInt (values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(byte.class)) {
byte[] tmpval = new byte[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Byte.parseByte (values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(boolean.class)) {
boolean[] tmpval = new boolean[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Boolean.parseBoolean(values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(short.class)) {
short[] tmpval = new short[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Short.parseShort (values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(long.class)) {
long[] tmpval = new long[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Long.parseLong (values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(double.class)) {
double[] tmpval = new double[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Double.parseDouble(values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(float.class)) {
float[] tmpval = new float[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = Float.parseFloat(values[i]);
+ }
method.invoke (bean, new Object[] {tmpval});
} else if (t.equals(char.class)) {
char[] tmpval = new char[values.length];
- for (int i = 0 ; i < values.length; i++)
+ for (int i = 0 ; i < values.length; i++) {
tmpval[i] = values[i].charAt(0);
+ }
method.invoke (bean, new Object[] {tmpval});
} else {
Object[] tmpval = new Integer[values.length];
@@ -805,10 +840,12 @@ public class JspRuntimeLibrary {
public static String getContextRelativePath(ServletRequest request,
String relativePath) {
- if (relativePath.startsWith("/"))
+ if (relativePath.startsWith("/")) {
return relativePath;
- if (!(request instanceof HttpServletRequest))
+ }
+ if (!(request instanceof HttpServletRequest)) {
return relativePath;
+ }
HttpServletRequest hrequest = (HttpServletRequest) request;
String uri = (String) request.getAttribute(
RequestDispatcher.INCLUDE_SERVLET_PATH);
@@ -816,13 +853,15 @@ public class JspRuntimeLibrary {
String pathInfo = (String)
request.getAttribute(RequestDispatcher.INCLUDE_PATH_INFO);
if (pathInfo == null) {
- if (uri.lastIndexOf('/') >= 0)
+ if (uri.lastIndexOf('/') >= 0) {
uri = uri.substring(0, uri.lastIndexOf('/'));
+ }
}
} else {
uri = hrequest.getServletPath();
- if (uri.lastIndexOf('/') >= 0)
+ if (uri.lastIndexOf('/') >= 0) {
uri = uri.substring(0, uri.lastIndexOf('/'));
+ }
}
return uri + '/' + relativePath;
@@ -849,8 +888,9 @@ public class JspRuntimeLibrary {
boolean flush)
throws IOException, ServletException {
- if (flush && !(out instanceof BodyContent))
+ if (flush && !(out instanceof BodyContent)) {
out.flush();
+ }
// FIXME - It is tempting to use request.getRequestDispatcher() to
// resolve a relative path directly, but Catalina currently does not
diff --git a/java/org/apache/jasper/runtime/JspWriterImpl.java b/java/org/apache/jasper/runtime/JspWriterImpl.java
index 60cab2f..58cee61 100644
--- a/java/org/apache/jasper/runtime/JspWriterImpl.java
+++ b/java/org/apache/jasper/runtime/JspWriterImpl.java
@@ -65,8 +65,9 @@ public class JspWriterImpl extends JspWriter {
public JspWriterImpl(ServletResponse response, int sz,
boolean autoFlush) {
super(sz, autoFlush);
- if (sz < 0)
+ if (sz < 0) {
throw new IllegalArgumentException(Localizer.getMessage("jsp.error.negativeBufferSize"));
+ }
this.response = response;
cb = sz == 0 ? null : new char[sz];
nextChar = 0;
@@ -74,8 +75,9 @@ public class JspWriterImpl extends JspWriter {
void init( ServletResponse response, int sz, boolean autoFlush ) {
this.response= response;
- if( sz > 0 && ( cb == null || sz > cb.length ) )
+ if( sz > 0 && ( cb == null || sz > cb.length ) ) {
cb=new char[sz];
+ }
nextChar = 0;
this.autoFlush=autoFlush;
this.bufferSize=sz;
@@ -99,12 +101,14 @@ public class JspWriterImpl extends JspWriter {
* @throws IOException Error writing buffered data
*/
protected final void flushBuffer() throws IOException {
- if (bufferSize == 0)
+ if (bufferSize == 0) {
return;
+ }
flushed = true;
ensureOpen();
- if (nextChar == 0)
+ if (nextChar == 0) {
return;
+ }
initOut();
out.write(cb, 0, nextChar);
nextChar = 0;
@@ -121,22 +125,25 @@ public class JspWriterImpl extends JspWriter {
*/
@Override
public final void clear() throws IOException {
- if ((bufferSize == 0) && (out != null))
+ if ((bufferSize == 0) && (out != null)) {
// clear() is illegal after any unbuffered output (JSP.5.5)
throw new IllegalStateException(
Localizer.getMessage("jsp.error.ise_on_clear"));
- if (flushed)
+ }
+ if (flushed) {
throw new IOException(
Localizer.getMessage("jsp.error.attempt_to_clear_flushed_buffer"));
+ }
ensureOpen();
nextChar = 0;
}
@Override
public void clearBuffer() throws IOException {
- if (bufferSize == 0)
+ if (bufferSize == 0) {
throw new IllegalStateException(
Localizer.getMessage("jsp.error.ise_on_clear"));
+ }
ensureOpen();
nextChar = 0;
}
@@ -163,12 +170,14 @@ public class JspWriterImpl extends JspWriter {
*/
@Override
public void close() throws IOException {
- if (response == null || closed)
+ if (response == null || closed) {
// multiple calls to close is OK
return;
+ }
flush();
- if (out != null)
+ if (out != null) {
out.close();
+ }
out = null;
closed = true;
}
@@ -183,8 +192,9 @@ public class JspWriterImpl extends JspWriter {
/** check to make sure that the stream has not been closed */
private void ensureOpen() throws IOException {
- if (response == null || closed)
+ if (response == null || closed) {
throw new IOException(Localizer.getMessage("jsp.error.stream.closed"));
+ }
}
@@ -198,11 +208,13 @@ public class JspWriterImpl extends JspWriter {
initOut();
out.write(c);
} else {
- if (nextChar >= bufferSize)
- if (autoFlush)
+ if (nextChar >= bufferSize) {
+ if (autoFlush) {
flushBuffer();
- else
+ } else {
bufferOverflow();
+ }
+ }
cb[nextChar++] = (char) c;
}
}
@@ -212,7 +224,9 @@ public class JspWriterImpl extends JspWriter {
* out of file descriptors and we're trying to print a stack trace.
*/
private static int min(int a, int b) {
- if (a < b) return a;
+ if (a < b) {
+ return a;
+ }
return b;
}
@@ -253,10 +267,11 @@ public class JspWriterImpl extends JspWriter {
/* If the request length exceeds the size of the output buffer,
flush the buffer and then write the data directly. In this
way buffered streams will cascade harmlessly. */
- if (autoFlush)
+ if (autoFlush) {
flushBuffer();
- else
+ } else {
bufferOverflow();
+ }
initOut();
out.write(cbuf, off, len);
return;
@@ -268,11 +283,13 @@ public class JspWriterImpl extends JspWriter {
System.arraycopy(cbuf, b, cb, nextChar, d);
b += d;
nextChar += d;
- if (nextChar >= bufferSize)
- if (autoFlush)
+ if (nextChar >= bufferSize) {
+ if (autoFlush) {
flushBuffer();
- else
+ } else {
bufferOverflow();
+ }
+ }
}
}
@@ -307,11 +324,13 @@ public class JspWriterImpl extends JspWriter {
s.getChars(b, b + d, cb, nextChar);
b += d;
nextChar += d;
- if (nextChar >= bufferSize)
- if (autoFlush)
+ if (nextChar >= bufferSize) {
+ if (autoFlush) {
flushBuffer();
- else
+ } else {
bufferOverflow();
+ }
+ }
}
}
diff --git a/java/org/apache/jasper/runtime/PageContextImpl.java b/java/org/apache/jasper/runtime/PageContextImpl.java
index 677217a..608b580 100644
--- a/java/org/apache/jasper/runtime/PageContextImpl.java
+++ b/java/org/apache/jasper/runtime/PageContextImpl.java
@@ -133,11 +133,13 @@ public class PageContextImpl extends PageContext {
this.applicationContext = JspApplicationContextImpl.getInstance(context);
// Setup session (if required)
- if (request instanceof HttpServletRequest && needsSession)
+ if (request instanceof HttpServletRequest && needsSession) {
this.session = ((HttpServletRequest) request).getSession();
- if (needsSession && session == null)
+ }
+ if (needsSession && session == null) {
throw new IllegalStateException(
"Page needs a session and none is available");
+ }
// initialize the initial out ...
depth = -1;
@@ -156,8 +158,9 @@ public class PageContextImpl extends PageContext {
setAttribute(REQUEST, request);
setAttribute(RESPONSE, response);
- if (session != null)
+ if (session != null) {
setAttribute(SESSION, session);
+ }
setAttribute(PAGE, servlet);
setAttribute(CONFIG, config);
@@ -427,24 +430,28 @@ public class PageContextImpl extends PageContext {
}
private int doGetAttributeScope(String name) {
- if (attributes.get(name) != null)
+ if (attributes.get(name) != null) {
return PAGE_SCOPE;
+ }
- if (request.getAttribute(name) != null)
+ if (request.getAttribute(name) != null) {
return REQUEST_SCOPE;
+ }
if (session != null) {
try {
- if (session.getAttribute(name) != null)
+ if (session.getAttribute(name) != null) {
return SESSION_SCOPE;
+ }
} catch(IllegalStateException ise) {
// Session has been invalidated.
// Ignore and fall through to application scope.
}
}
- if (context.getAttribute(name) != null)
+ if (context.getAttribute(name) != null) {
return APPLICATION_SCOPE;
+ }
return 0;
}
@@ -477,12 +484,14 @@ public class PageContextImpl extends PageContext {
private Object doFindAttribute(String name) {
Object o = attributes.get(name);
- if (o != null)
+ if (o != null) {
return o;
+ }
o = request.getAttribute(name);
- if (o != null)
+ if (o != null) {
return o;
+ }
if (session != null) {
try {
@@ -491,8 +500,9 @@ public class PageContextImpl extends PageContext {
// Session has been invalidated.
// Ignore and fall through to application scope.
}
- if (o != null)
+ if (o != null) {
return o;
+ }
}
return context.getAttribute(name);
@@ -632,8 +642,9 @@ public class PageContextImpl extends PageContext {
if (!path.startsWith("/")) {
String uri = (String) request.getAttribute(
RequestDispatcher.INCLUDE_SERVLET_PATH);
- if (uri == null)
+ if (uri == null) {
uri = ((HttpServletRequest) request).getServletPath();
+ }
String baseURI = uri.substring(0, uri.lastIndexOf('/'));
path = baseURI + '/' + path;
}
@@ -733,14 +744,16 @@ public class PageContextImpl extends PageContext {
String includeUri = (String) request.getAttribute(
RequestDispatcher.INCLUDE_SERVLET_PATH);
- if (includeUri != null)
+ if (includeUri != null) {
request.removeAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH);
+ }
try {
context.getRequestDispatcher(path).forward(request, response);
} finally {
- if (includeUri != null)
+ if (includeUri != null) {
request.setAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH,
includeUri);
+ }
}
}
@@ -810,8 +823,9 @@ public class PageContextImpl extends PageContext {
@Override
public void handlePageException(final Throwable t) throws IOException,
ServletException {
- if (t == null)
+ if (t == null) {
throw new NullPointerException("null Throwable");
+ }
if (SecurityUtil.isPackageProtectionEnabled()) {
try {
@@ -885,12 +899,15 @@ public class PageContextImpl extends PageContext {
// Otherwise throw the exception wrapped inside a ServletException.
// Set the exception as the root cause in the ServletException
// to get a stack trace for the real problem
- if (t instanceof IOException)
+ if (t instanceof IOException) {
throw (IOException) t;
- if (t instanceof ServletException)
+ }
+ if (t instanceof ServletException) {
throw (ServletException) t;
- if (t instanceof RuntimeException)
+ }
+ if (t instanceof RuntimeException) {
throw (RuntimeException) t;
+ }
Throwable rootCause = null;
if (t instanceof JspException || t instanceof ELException ||
diff --git a/java/org/apache/jasper/runtime/TagHandlerPool.java b/java/org/apache/jasper/runtime/TagHandlerPool.java
index 6a753cc..dbc55f8 100644
--- a/java/org/apache/jasper/runtime/TagHandlerPool.java
+++ b/java/org/apache/jasper/runtime/TagHandlerPool.java
@@ -53,8 +53,9 @@ public class TagHandlerPool {
result = null;
}
}
- if (result == null)
+ if (result == null) {
result = new TagHandlerPool();
+ }
result.init(config);
return result;
@@ -155,17 +156,21 @@ public class TagHandlerPool {
protected static String getOption(ServletConfig config, String name,
String defaultV) {
- if (config == null)
+ if (config == null) {
return defaultV;
+ }
String value = config.getInitParameter(name);
- if (value != null)
+ if (value != null) {
return value;
- if (config.getServletContext() == null)
+ }
+ if (config.getServletContext() == null) {
return defaultV;
+ }
value = config.getServletContext().getInitParameter(name);
- if (value != null)
+ if (value != null) {
return value;
+ }
return defaultV;
}
diff --git a/java/org/apache/jasper/servlet/JasperLoader.java b/java/org/apache/jasper/servlet/JasperLoader.java
index 4f37939..f8accc4 100644
--- a/java/org/apache/jasper/servlet/JasperLoader.java
+++ b/java/org/apache/jasper/servlet/JasperLoader.java
@@ -93,8 +93,9 @@ public class JasperLoader extends URLClassLoader {
// (0) Check our previously loaded class cache
clazz = findLoadedClass(name);
if (clazz != null) {
- if (resolve)
+ if (resolve) {
resolveClass(clazz);
+ }
return clazz;
}
@@ -120,8 +121,9 @@ public class JasperLoader extends URLClassLoader {
// Class is not in org.apache.jsp, therefore, have our
// parent load it
clazz = getParent().loadClass(name);
- if( resolve )
+ if( resolve ) {
resolveClass(clazz);
+ }
return clazz;
}
diff --git a/java/org/apache/jasper/servlet/JspCServletContext.java b/java/org/apache/jasper/servlet/JspCServletContext.java
index 8096a3c..ae38792 100644
--- a/java/org/apache/jasper/servlet/JspCServletContext.java
+++ b/java/org/apache/jasper/servlet/JspCServletContext.java
@@ -342,10 +342,12 @@ public class JspCServletContext implements ServletContext {
*/
@Override
public String getRealPath(String path) {
- if (!myResourceBaseURL.getProtocol().equals("file"))
+ if (!myResourceBaseURL.getProtocol().equals("file")) {
return null;
- if (!path.startsWith("/"))
+ }
+ if (!path.startsWith("/")) {
return null;
+ }
try {
File f = new File(getResource(path).toURI());
return f.getAbsolutePath();
diff --git a/java/org/apache/jasper/servlet/JspServlet.java b/java/org/apache/jasper/servlet/JspServlet.java
index 5f5d7e5..0f5629b 100644
--- a/java/org/apache/jasper/servlet/JspServlet.java
+++ b/java/org/apache/jasper/servlet/JspServlet.java
@@ -142,7 +142,9 @@ public class JspServlet extends HttpServlet implements PeriodicEventListener {
throw new ServletException("Could not precompile jsp: " + jspFile, e);
} catch (PrivilegedActionException e) {
Throwable t = e.getCause();
- if (t instanceof ServletException) throw (ServletException)t;
+ if (t instanceof ServletException) {
+ throw (ServletException)t;
+ }
throw new ServletException("Could not precompile jsp: " + jspFile, e);
}
}
diff --git a/java/org/apache/jasper/tagplugins/jstl/Util.java b/java/org/apache/jasper/tagplugins/jstl/Util.java
index ed9b730..0d85694 100644
--- a/java/org/apache/jasper/tagplugins/jstl/Util.java
+++ b/java/org/apache/jasper/tagplugins/jstl/Util.java
@@ -127,10 +127,14 @@ public class Util {
int begin;
int end;
int index = input.toUpperCase(Locale.ENGLISH).indexOf(name.toUpperCase(Locale.ENGLISH));
- if (index == -1) return null;
+ if (index == -1) {
+ return null;
+ }
index = index + name.length(); // positioned after the attribute name
index = input.indexOf('=', index); // positioned at the '='
- if (index == -1) return null;
+ if (index == -1) {
+ return null;
+ }
index += 1; // positioned after the '='
input = input.substring(index).trim();
@@ -138,12 +142,18 @@ public class Util {
// attribute value is a quoted string
begin = 1;
end = input.indexOf('"', begin);
- if (end == -1) return null;
+ if (end == -1) {
+ return null;
+ }
} else {
begin = 0;
end = input.indexOf(';');
- if (end == -1) end = input.indexOf(' ');
- if (end == -1) end = input.length();
+ if (end == -1) {
+ end = input.indexOf(' ');
+ }
+ if (end == -1) {
+ end = input.length();
+ }
}
return input.substring(begin, end).trim();
}
@@ -163,10 +173,12 @@ public class Util {
int sessionStart;
while ((sessionStart = u.toString().indexOf(";" + Constants.SESSION_PARAMETER_NAME + "=")) != -1) {
int sessionEnd = u.toString().indexOf(';', sessionStart + 1);
- if (sessionEnd == -1)
+ if (sessionEnd == -1) {
sessionEnd = u.toString().indexOf('?', sessionStart + 1);
- if (sessionEnd == -1) // still
+ }
+ if (sessionEnd == -1) {
sessionEnd = u.length();
+ }
u.delete(sessionStart, sessionEnd);
}
return u.toString();
@@ -246,17 +258,19 @@ public class Util {
String url, String context, PageContext pageContext)
throws JspException {
// don't touch absolute URLs
- if (isAbsoluteUrl(url))
+ if (isAbsoluteUrl(url)) {
return url;
+ }
// normalize relative URLs against a context root
HttpServletRequest request =
(HttpServletRequest) pageContext.getRequest();
if (context == null) {
- if (url.startsWith("/"))
+ if (url.startsWith("/")) {
return (request.getContextPath() + url);
- else
+ } else {
return url;
+ }
} else {
if (!context.startsWith("/") || !url.startsWith("/")) {
throw new JspTagException(
@@ -312,18 +326,20 @@ public class Util {
@Override
public PrintWriter getWriter() {
- if (isStreamUsed)
+ if (isStreamUsed) {
throw new IllegalStateException("Unexpected internal error during <import>: " +
"Target servlet called getWriter(), then getOutputStream()");
+ }
isWriterUsed = true;
return new PrintWriter(sw);
}
@Override
public ServletOutputStream getOutputStream() {
- if (isWriterUsed)
+ if (isWriterUsed) {
throw new IllegalStateException("Unexpected internal error during <import>: " +
"Target servlet called getOutputStream(), then getWriter()");
+ }
isStreamUsed = true;
return sos;
}
@@ -357,15 +373,18 @@ public class Util {
}
public String getString() throws UnsupportedEncodingException {
- if (isWriterUsed)
+ if (isWriterUsed) {
return sw.toString();
- else if (isStreamUsed) {
- if (this.charEncoding != null && !this.charEncoding.equals(""))
+ } else if (isStreamUsed) {
+ if (this.charEncoding != null && !this.charEncoding.equals("")) {
return bos.toString(charEncoding);
- else
+ } else {
return bos.toString("ISO-8859-1");
- } else
+ }
+ }
+ else {
return ""; // target didn't write anything
+ }
}
}
diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index e8fc26a..b2bb0eb 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -53,7 +53,7 @@
<module name="AvoidNestedBlocks">
<property name="allowInSwitchCase" value="true"/>
</module>
- <!-- ~1000 errors
+ <!-- ~650 errors
<module name="NeedBraces"/>
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Code clean-up. Add braces for clarity
Posted by ma...@apache.org.
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 67f9942228b68bb67f8a62cc4e24854ff4834233
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 26 12:28:51 2021 +0100
Code clean-up. Add braces for clarity
Again, primarily to trigger CI builds to tes CI config changes
---
.../storeconfig/ConnectorStoreAppender.java | 6 +-
.../catalina/storeconfig/CredentialHandlerSF.java | 6 +-
.../apache/catalina/storeconfig/InterceptorSF.java | 6 +-
java/org/apache/catalina/storeconfig/LoaderSF.java | 3 +-
.../org/apache/catalina/storeconfig/ManagerSF.java | 6 +-
.../catalina/storeconfig/NamingResourcesSF.java | 3 +-
java/org/apache/catalina/storeconfig/RealmSF.java | 6 +-
.../catalina/storeconfig/StandardContextSF.java | 31 ++-
.../catalina/storeconfig/StandardEngineSF.java | 3 +-
.../catalina/storeconfig/StandardHostSF.java | 3 +-
.../apache/catalina/storeconfig/StoreAppender.java | 12 +-
.../apache/catalina/storeconfig/StoreConfig.java | 3 +-
.../catalina/storeconfig/StoreContextAppender.java | 21 +-
.../catalina/storeconfig/StoreDescription.java | 23 +-
.../catalina/storeconfig/StoreFactoryBase.java | 9 +-
.../catalina/storeconfig/StoreFactoryRule.java | 3 +-
.../catalina/storeconfig/WatchedResourceSF.java | 3 +-
.../catalina/storeconfig/WrapperLifecycleSF.java | 3 +-
.../catalina/storeconfig/WrapperListenerSF.java | 3 +-
java/org/apache/catalina/tribes/ByteMessage.java | 4 +-
.../apache/catalina/tribes/ChannelException.java | 23 +-
java/org/apache/catalina/tribes/UniqueId.java | 17 +-
.../catalina/tribes/group/AbsoluteOrder.java | 16 +-
.../catalina/tribes/group/ChannelCoordinator.java | 32 ++-
.../tribes/group/ChannelInterceptorBase.java | 66 ++++--
.../apache/catalina/tribes/group/GroupChannel.java | 68 ++++--
.../apache/catalina/tribes/group/RpcChannel.java | 43 +++-
.../interceptors/DomainFilterInterceptor.java | 48 ++--
.../group/interceptors/EncryptInterceptor.java | 36 +--
.../interceptors/FragmentationInterceptor.java | 15 +-
.../interceptors/MessageDispatchInterceptor.java | 4 +-
.../group/interceptors/NonBlockingCoordinator.java | 96 ++++++--
.../group/interceptors/OrderInterceptor.java | 53 +++--
.../interceptors/StaticMembershipInterceptor.java | 55 +++--
.../group/interceptors/TcpFailureDetector.java | 79 +++++--
.../group/interceptors/TcpPingInterceptor.java | 25 ++-
.../group/interceptors/ThroughputInterceptor.java | 19 +-
.../interceptors/TwoPhaseCommitInterceptor.java | 11 +-
java/org/apache/catalina/tribes/io/BufferPool.java | 15 +-
.../org/apache/catalina/tribes/io/ChannelData.java | 12 +-
.../apache/catalina/tribes/io/ObjectReader.java | 8 +-
.../catalina/tribes/io/ReplicationStream.java | 21 +-
.../org/apache/catalina/tribes/io/XByteBuffer.java | 52 +++--
.../apache/catalina/tribes/jmx/JmxRegistry.java | 24 +-
.../catalina/tribes/membership/McastService.java | 66 ++++--
.../tribes/membership/McastServiceImpl.java | 109 +++++++---
.../catalina/tribes/membership/MemberImpl.java | 4 +-
.../catalina/tribes/membership/Membership.java | 4 +-
.../catalina/tribes/membership/StaticMember.java | 26 ++-
.../tribes/tipis/AbstractReplicatedMap.java | 241 +++++++++++++++------
.../catalina/tribes/tipis/LazyReplicatedMap.java | 21 +-
.../catalina/tribes/tipis/ReplicatedMap.java | 41 +++-
.../catalina/tribes/transport/AbstractSender.java | 14 +-
.../catalina/tribes/transport/PooledSender.java | 15 +-
.../catalina/tribes/transport/ReceiverBase.java | 32 ++-
.../tribes/transport/ReplicationTransmitter.java | 8 +-
.../catalina/tribes/transport/RxTaskPool.java | 9 +-
.../catalina/tribes/transport/nio/NioReceiver.java | 64 ++++--
.../tribes/transport/nio/NioReplicationTask.java | 70 ++++--
.../catalina/tribes/transport/nio/NioSender.java | 65 ++++--
.../tribes/transport/nio/ParallelNioSender.java | 85 ++++++--
.../tribes/transport/nio/PooledParallelSender.java | 7 +-
java/org/apache/catalina/tribes/util/Arrays.java | 74 +++++--
.../catalina/tribes/util/ExecutorFactory.java | 16 +-
.../apache/catalina/tribes/util/UUIDGenerator.java | 7 +-
res/checkstyle/checkstyle.xml | 2 +-
66 files changed, 1425 insertions(+), 550 deletions(-)
diff --git a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
index b4093d5..586fa1e 100644
--- a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
+++ b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
@@ -128,8 +128,9 @@ public class ConnectorStoreAppender extends StoreAppender {
}
if ("protocol".equals(descriptor.getName())
|| "protocolHandlerClassName".equals(descriptor
- .getName()))
+ .getName())) {
continue;
+ }
propertyKeys.add(descriptor.getName());
}
// Add the properties of the protocol handler
@@ -287,8 +288,9 @@ public class ConnectorStoreAppender extends StoreAppender {
File jkHomeBase;
File file = new File(jkHome);
- if (!file.isAbsolute())
+ if (!file.isAbsolute()) {
file = new File(appBase, jkHome);
+ }
try {
jkHomeBase = file.getCanonicalFile();
} catch (IOException e) {
diff --git a/java/org/apache/catalina/storeconfig/CredentialHandlerSF.java b/java/org/apache/catalina/storeconfig/CredentialHandlerSF.java
index 7e85497..bb90e1f 100644
--- a/java/org/apache/catalina/storeconfig/CredentialHandlerSF.java
+++ b/java/org/apache/catalina/storeconfig/CredentialHandlerSF.java
@@ -39,9 +39,10 @@ public class CredentialHandlerSF extends StoreFactoryBase {
aElement.getClass());
if (elementDesc != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(sm.getString("factory.storeTag",
elementDesc.getTag(), aElement));
+ }
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printOpenTag(aWriter, indent + 2, aElement,
elementDesc);
@@ -49,9 +50,10 @@ public class CredentialHandlerSF extends StoreFactoryBase {
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printCloseTag(aWriter, elementDesc);
} else {
- if (log.isWarnEnabled())
+ if (log.isWarnEnabled()) {
log.warn(sm.getString("factory.storeNoDescriptor",
aElement.getClass()));
+ }
}
} else {
super.store(aWriter, indent, aElement);
diff --git a/java/org/apache/catalina/storeconfig/InterceptorSF.java b/java/org/apache/catalina/storeconfig/InterceptorSF.java
index 205d221..0602141 100644
--- a/java/org/apache/catalina/storeconfig/InterceptorSF.java
+++ b/java/org/apache/catalina/storeconfig/InterceptorSF.java
@@ -39,9 +39,10 @@ public class InterceptorSF extends StoreFactoryBase {
aElement.getClass());
if (elementDesc != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(sm.getString("factory.storeTag",
elementDesc.getTag(), aElement));
+ }
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printOpenTag(aWriter, indent + 2, aElement,
elementDesc);
@@ -49,9 +50,10 @@ public class InterceptorSF extends StoreFactoryBase {
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printCloseTag(aWriter, elementDesc);
} else {
- if (log.isWarnEnabled())
+ if (log.isWarnEnabled()) {
log.warn(sm.getString("factory.storeNoDescriptor",
aElement.getClass()));
+ }
}
} else {
super.store(aWriter, indent, aElement);
diff --git a/java/org/apache/catalina/storeconfig/LoaderSF.java b/java/org/apache/catalina/storeconfig/LoaderSF.java
index 1d89e9f..d501977 100644
--- a/java/org/apache/catalina/storeconfig/LoaderSF.java
+++ b/java/org/apache/catalina/storeconfig/LoaderSF.java
@@ -44,9 +44,10 @@ public class LoaderSF extends StoreFactoryBase {
if (elementDesc != null) {
Loader loader = (Loader) aElement;
if (!isDefaultLoader(loader)) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("store " + elementDesc.getTag() + "( " + aElement
+ " )");
+ }
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printTag(aWriter, indent + 2, loader,
elementDesc);
diff --git a/java/org/apache/catalina/storeconfig/ManagerSF.java b/java/org/apache/catalina/storeconfig/ManagerSF.java
index e4e0a79..715d16f 100644
--- a/java/org/apache/catalina/storeconfig/ManagerSF.java
+++ b/java/org/apache/catalina/storeconfig/ManagerSF.java
@@ -46,18 +46,20 @@ public class ManagerSF extends StoreFactoryBase {
if (aElement instanceof StandardManager) {
StandardManager manager = (StandardManager) aElement;
if (!isDefaultManager(manager)) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(sm.getString("factory.storeTag", elementDesc
.getTag(), aElement));
+ }
super.store(aWriter, indent, aElement);
}
} else {
super.store(aWriter, indent, aElement);
}
} else {
- if (log.isWarnEnabled())
+ if (log.isWarnEnabled()) {
log.warn(sm.getString("factory.storeNoDescriptor", aElement
.getClass()));
+ }
}
}
diff --git a/java/org/apache/catalina/storeconfig/NamingResourcesSF.java b/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
index 603d8c8..90e349e 100644
--- a/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
+++ b/java/org/apache/catalina/storeconfig/NamingResourcesSF.java
@@ -45,9 +45,10 @@ public class NamingResourcesSF extends StoreFactoryBase {
StoreDescription elementDesc = getRegistry().findDescription(
aElement.getClass());
if (elementDesc != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("store " + elementDesc.getTag() + "( " + aElement
+ " )");
+ }
storeChildren(aWriter, indent, aElement, elementDesc);
} else {
if (log.isWarnEnabled())
diff --git a/java/org/apache/catalina/storeconfig/RealmSF.java b/java/org/apache/catalina/storeconfig/RealmSF.java
index cf257bd..0d870d5 100644
--- a/java/org/apache/catalina/storeconfig/RealmSF.java
+++ b/java/org/apache/catalina/storeconfig/RealmSF.java
@@ -40,9 +40,10 @@ public class RealmSF extends StoreFactoryBase {
aElement.getClass());
if (elementDesc != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(sm.getString("factory.storeTag",
elementDesc.getTag(), aElement));
+ }
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printOpenTag(aWriter, indent + 2, aElement,
elementDesc);
@@ -50,9 +51,10 @@ public class RealmSF extends StoreFactoryBase {
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printCloseTag(aWriter, elementDesc);
} else {
- if (log.isWarnEnabled())
+ if (log.isWarnEnabled()) {
log.warn(sm.getString("factory.storeNoDescriptor",
aElement.getClass()));
+ }
}
} else {
super.store(aWriter, indent, aElement);
diff --git a/java/org/apache/catalina/storeconfig/StandardContextSF.java b/java/org/apache/catalina/storeconfig/StandardContextSF.java
index cc02212..754ce96 100644
--- a/java/org/apache/catalina/storeconfig/StandardContextSF.java
+++ b/java/org/apache/catalina/storeconfig/StandardContextSF.java
@@ -77,11 +77,12 @@ public class StandardContextSF extends StoreFactoryBase {
.getConfigFile();
if (configFile != null) {
if (desc.isExternalAllowed()) {
- if (desc.isBackup())
+ if (desc.isBackup()) {
storeWithBackup((StandardContext) aContext);
- else
+ } else {
storeContextSeparate(aWriter, indent,
(StandardContext) aContext);
+ }
return;
}
} else if (desc.isExternalOnly()) {
@@ -93,11 +94,12 @@ public class StandardContextSF extends StoreFactoryBase {
String baseName = cn.getBaseName();
File xml = new File(configBase, baseName + ".xml");
context.setConfigFile(xml.toURI().toURL());
- if (desc.isBackup())
+ if (desc.isBackup()) {
storeWithBackup((StandardContext) aContext);
- else
+ } else {
storeContextSeparate(aWriter, indent,
(StandardContext) aContext);
+ }
return;
}
}
@@ -131,9 +133,10 @@ public class StandardContextSF extends StoreFactoryBase {
+ configFile
+ " not a file, or not writable.");
}
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info("Store Context " + aContext.getPath()
+ " separate at file " + config);
+ }
try (FileOutputStream fos = new FileOutputStream(config);
PrintWriter writer = new PrintWriter(new OutputStreamWriter(
fos , getRegistry().getEncoding()))) {
@@ -172,10 +175,11 @@ public class StandardContextSF extends StoreFactoryBase {
throw new IOException("Context save file at "
+ mover.getConfigSave() + " is not writable.");
}
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info("Store Context " + aContext.getPath()
+ " separate with backup (at file "
+ mover.getConfigSave() + " )");
+ }
try (PrintWriter writer = mover.getWriter()) {
storeXMLHead(writer);
@@ -350,16 +354,21 @@ public class StandardContextSF extends StoreFactoryBase {
List<String> resource = new ArrayList<>();
for (String wresource : wresources) {
- if (wresource.equals(confContext))
+ if (wresource.equals(confContext)) {
continue;
- if (wresource.equals(confWeb))
+ }
+ if (wresource.equals(confWeb)) {
continue;
- if (wresource.equals(confHostDefault))
+ }
+ if (wresource.equals(confHostDefault)) {
continue;
- if (wresource.equals(configFile))
+ }
+ if (wresource.equals(configFile)) {
continue;
- if (wresource.equals(webxml))
+ }
+ if (wresource.equals(webxml)) {
continue;
+ }
resource.add(wresource);
}
return resource.toArray(new String[0]);
diff --git a/java/org/apache/catalina/storeconfig/StandardEngineSF.java b/java/org/apache/catalina/storeconfig/StandardEngineSF.java
index d9866b2..61c6fd3 100644
--- a/java/org/apache/catalina/storeconfig/StandardEngineSF.java
+++ b/java/org/apache/catalina/storeconfig/StandardEngineSF.java
@@ -75,8 +75,9 @@ public class StandardEngineSF extends StoreFactoryBase {
if(valves != null && valves.length > 0 ) {
List<Valve> engineValves = new ArrayList<>() ;
for (Valve valve : valves) {
- if (!(valve instanceof ClusterValve))
+ if (!(valve instanceof ClusterValve)) {
engineValves.add(valve);
+ }
}
storeElementArray(aWriter, indent, engineValves.toArray());
}
diff --git a/java/org/apache/catalina/storeconfig/StandardHostSF.java b/java/org/apache/catalina/storeconfig/StandardHostSF.java
index 4317e49..495c343 100644
--- a/java/org/apache/catalina/storeconfig/StandardHostSF.java
+++ b/java/org/apache/catalina/storeconfig/StandardHostSF.java
@@ -81,8 +81,9 @@ public class StandardHostSF extends StoreFactoryBase {
if(valves != null && valves.length > 0 ) {
List<Valve> hostValves = new ArrayList<>() ;
for (Valve valve : valves) {
- if (!(valve instanceof ClusterValve))
+ if (!(valve instanceof ClusterValve)) {
hostValves.add(valve);
+ }
}
storeElementArray(aWriter, indent, hostValves.toArray());
}
diff --git a/java/org/apache/catalina/storeconfig/StoreAppender.java b/java/org/apache/catalina/storeconfig/StoreAppender.java
index 2c1ce56..77abd89 100644
--- a/java/org/apache/catalina/storeconfig/StoreAppender.java
+++ b/java/org/apache/catalina/storeconfig/StoreAppender.java
@@ -71,8 +71,9 @@ public class StoreAppender {
StoreDescription aDesc) throws Exception {
aWriter.print("<");
aWriter.print(aDesc.getTag());
- if (aDesc.isAttributes() && bean != null)
+ if (aDesc.isAttributes() && bean != null) {
printAttributes(aWriter, indent, bean, aDesc);
+ }
aWriter.println(">");
}
@@ -89,8 +90,9 @@ public class StoreAppender {
StoreDescription aDesc) throws Exception {
aWriter.print("<");
aWriter.print(aDesc.getTag());
- if (aDesc.isAttributes() && bean != null)
+ if (aDesc.isAttributes() && bean != null) {
printAttributes(aWriter, indent, bean, aDesc);
+ }
aWriter.println("/>");
}
@@ -131,8 +133,9 @@ public class StoreAppender {
for (int i = 0; i < elements.length; i++) {
printIndent(aWriter, indent + 4);
aWriter.print(elements[i]);
- if (i + 1 < elements.length)
+ if (i + 1 < elements.length) {
aWriter.println(",");
+ }
}
printIndent(aWriter, indent + 2);
aWriter.print("</");
@@ -298,8 +301,9 @@ public class StoreAppender {
* @param value The attribute value
*/
protected void printAttribute(PrintWriter writer, int indent, Object bean, StoreDescription desc, String attributeName, Object bean2, Object value) {
- if (isPrintValue(bean, bean2, attributeName, desc))
+ if (isPrintValue(bean, bean2, attributeName, desc)) {
printValue(writer, indent, attributeName, value);
+ }
}
/**
diff --git a/java/org/apache/catalina/storeconfig/StoreConfig.java b/java/org/apache/catalina/storeconfig/StoreConfig.java
index 0f0ddcd..39af17e 100644
--- a/java/org/apache/catalina/storeconfig/StoreConfig.java
+++ b/java/org/apache/catalina/storeconfig/StoreConfig.java
@@ -287,8 +287,9 @@ public class StoreConfig implements IStoreConfig {
desc.setStoreSeparate(false);
desc.getStoreFactory().store(aWriter, indent, aContext);
} finally {
- if (desc != null)
+ if (desc != null) {
desc.setStoreSeparate(oldSeparate);
+ }
}
}
diff --git a/java/org/apache/catalina/storeconfig/StoreContextAppender.java b/java/org/apache/catalina/storeconfig/StoreContextAppender.java
index b8a1b03..920a482 100644
--- a/java/org/apache/catalina/storeconfig/StoreContextAppender.java
+++ b/java/org/apache/catalina/storeconfig/StoreContextAppender.java
@@ -39,8 +39,9 @@ public class StoreContextAppender extends StoreAppender {
if(attributeName.equals("docBase")) {
if(bean instanceof StandardContext) {
String docBase = ((StandardContext)bean).getOriginalDocBase() ;
- if(docBase != null)
+ if(docBase != null) {
value = docBase ;
+ }
}
}
printValue(writer, indent, attributeName, value);
@@ -85,9 +86,10 @@ public class StoreContextAppender extends StoreAppender {
File appBase;
File file = new File(host.getAppBase());
- if (!file.isAbsolute())
+ if (!file.isAbsolute()) {
file = new File(System.getProperty("catalina.base"), host
.getAppBase());
+ }
try {
appBase = file.getCanonicalFile();
} catch (IOException e) {
@@ -100,11 +102,13 @@ public class StoreContextAppender extends StoreAppender {
protected File getDocBase(StandardContext context, File appBase) {
File docBase;
String contextDocBase = context.getOriginalDocBase() ;
- if(contextDocBase == null)
+ if(contextDocBase == null) {
contextDocBase = context.getDocBase() ;
+ }
File file = new File(contextDocBase);
- if (!file.isAbsolute())
+ if (!file.isAbsolute()) {
file = new File(appBase, contextDocBase);
+ }
try {
docBase = file.getCanonicalFile();
} catch (IOException e) {
@@ -122,10 +126,12 @@ public class StoreContextAppender extends StoreAppender {
protected String getDefaultWorkDir(StandardContext context) {
String defaultWorkDir = null;
String contextWorkDir = context.getName();
- if (contextWorkDir.length() == 0)
+ if (contextWorkDir.length() == 0) {
contextWorkDir = "_";
- if (contextWorkDir.startsWith("/"))
+ }
+ if (contextWorkDir.startsWith("/")) {
contextWorkDir = contextWorkDir.substring(1);
+ }
Container host = context.getParent();
if (host instanceof StandardHost) {
@@ -167,7 +173,8 @@ public class StoreContextAppender extends StoreAppender {
* .getConfigBase(), "context.xml.default")); }
*/
return defaultContext;
- } else
+ } else {
return super.defaultInstance(bean);
+ }
}
}
diff --git a/java/org/apache/catalina/storeconfig/StoreDescription.java b/java/org/apache/catalina/storeconfig/StoreDescription.java
index 4bb23b3..0ede758 100644
--- a/java/org/apache/catalina/storeconfig/StoreDescription.java
+++ b/java/org/apache/catalina/storeconfig/StoreDescription.java
@@ -248,14 +248,16 @@ public class StoreDescription {
}
public void addTransientAttribute(String attribute) {
- if (transientAttributes == null)
+ if (transientAttributes == null) {
transientAttributes = new ArrayList<>();
+ }
transientAttributes.add(attribute);
}
public void removeTransientAttribute(String attribute) {
- if (transientAttributes != null)
+ if (transientAttributes != null) {
transientAttributes.remove(attribute);
+ }
}
/**
@@ -274,14 +276,16 @@ public class StoreDescription {
}
public void addTransientChild(String classname) {
- if (transientChildren == null)
+ if (transientChildren == null) {
transientChildren = new ArrayList<>();
+ }
transientChildren.add(classname);
}
public void removeTransientChild(String classname) {
- if (transientChildren != null)
+ if (transientChildren != null) {
transientChildren.remove(classname);
+ }
}
/**
@@ -291,8 +295,9 @@ public class StoreDescription {
* @return is classname attribute?
*/
public boolean isTransientChild(String classname) {
- if (transientChildren != null)
+ if (transientChildren != null) {
return transientChildren.contains(classname);
+ }
return false;
}
@@ -303,8 +308,9 @@ public class StoreDescription {
* @return is transient attribute?
*/
public boolean isTransientAttribute(String attribute) {
- if (transientAttributes != null)
+ if (transientAttributes != null) {
return transientAttributes.contains(attribute);
+ }
return false;
}
@@ -314,10 +320,11 @@ public class StoreDescription {
* @return Returns the id.
*/
public String getId() {
- if (id != null)
+ if (id != null) {
return id;
- else
+ } else {
return getTagClass();
+ }
}
/**
diff --git a/java/org/apache/catalina/storeconfig/StoreFactoryBase.java b/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
index ded0772..b817dab 100644
--- a/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
+++ b/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
@@ -116,9 +116,10 @@ public class StoreFactoryBase implements IStoreFactory {
aElement.getClass());
if (elementDesc != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(sm.getString("factory.storeTag",
elementDesc.getTag(), aElement));
+ }
getStoreAppender().printIndent(aWriter, indent + 2);
if (!elementDesc.isChildren()) {
getStoreAppender().printTag(aWriter, indent, aElement,
@@ -130,9 +131,10 @@ public class StoreFactoryBase implements IStoreFactory {
getStoreAppender().printIndent(aWriter, indent + 2);
getStoreAppender().printCloseTag(aWriter, elementDesc);
}
- } else
+ } else {
log.warn(sm.getString("factory.storeNoDescriptor", aElement
.getClass()));
+ }
}
/**
@@ -166,8 +168,9 @@ public class StoreFactoryBase implements IStoreFactory {
if (elementFactory != null) {
StoreDescription desc = getRegistry().findDescription(
aTagElement.getClass());
- if (!desc.isTransientChild(aTagElement.getClass().getName()))
+ if (!desc.isTransientChild(aTagElement.getClass().getName())) {
elementFactory.store(aWriter, indent, aTagElement);
+ }
} else {
log.warn(sm.getString("factory.storeNoDescriptor", aTagElement
.getClass()));
diff --git a/java/org/apache/catalina/storeconfig/StoreFactoryRule.java b/java/org/apache/catalina/storeconfig/StoreFactoryRule.java
index 69d8d4d..a49a0fb 100644
--- a/java/org/apache/catalina/storeconfig/StoreFactoryRule.java
+++ b/java/org/apache/catalina/storeconfig/StoreFactoryRule.java
@@ -114,8 +114,9 @@ public class StoreFactoryRule extends Rule {
String className = defaultName;
if (attr != null) {
String value = attributes.getValue(attr);
- if (value != null)
+ if (value != null) {
className = value;
+ }
}
Class<?> clazz = Class.forName(className);
return clazz.getConstructor().newInstance();
diff --git a/java/org/apache/catalina/storeconfig/WatchedResourceSF.java b/java/org/apache/catalina/storeconfig/WatchedResourceSF.java
index a97e414..e0f83e2 100644
--- a/java/org/apache/catalina/storeconfig/WatchedResourceSF.java
+++ b/java/org/apache/catalina/storeconfig/WatchedResourceSF.java
@@ -41,9 +41,10 @@ public class WatchedResourceSF extends StoreFactoryBase {
String[] resources = ((StandardContext) aElement)
.findWatchedResources();
if (elementDesc != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("store " + elementDesc.getTag() + "( " + aElement
+ " )");
+ }
getStoreAppender().printTagArray(aWriter, "WatchedResource",
indent, resources);
}
diff --git a/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java b/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java
index d4aab43..150bf5e 100644
--- a/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java
+++ b/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java
@@ -41,9 +41,10 @@ public class WrapperLifecycleSF extends StoreFactoryBase {
String[] listeners = ((StandardContext) aElement)
.findWrapperLifecycles();
if (elementDesc != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("store " + elementDesc.getTag() + "( " + aElement
+ " )");
+ }
getStoreAppender().printTagArray(aWriter, "WrapperLifecycle",
indent, listeners);
}
diff --git a/java/org/apache/catalina/storeconfig/WrapperListenerSF.java b/java/org/apache/catalina/storeconfig/WrapperListenerSF.java
index 888b519..393a6a6 100644
--- a/java/org/apache/catalina/storeconfig/WrapperListenerSF.java
+++ b/java/org/apache/catalina/storeconfig/WrapperListenerSF.java
@@ -41,9 +41,10 @@ public class WrapperListenerSF extends StoreFactoryBase {
String[] listeners = ((StandardContext) aElement)
.findWrapperListeners();
if (elementDesc != null) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("store " + elementDesc.getTag() + "( " + aElement
+ " )");
+ }
getStoreAppender().printTagArray(aWriter, "WrapperListener",
indent, listeners);
}
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java b/java/org/apache/catalina/tribes/ByteMessage.java
index e300e74..cd414aa 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -94,7 +94,9 @@ public class ByteMessage implements Externalizable {
@Override
public void writeExternal(ObjectOutput out) throws IOException {
out.writeInt(message!=null?message.length:0);
- if ( message!=null ) out.write(message,0,message.length);
+ if ( message!=null ) {
+ out.write(message,0,message.length);
+ }
}
}
diff --git a/java/org/apache/catalina/tribes/ChannelException.java b/java/org/apache/catalina/tribes/ChannelException.java
index 9ec2924..8492dea 100644
--- a/java/org/apache/catalina/tribes/ChannelException.java
+++ b/java/org/apache/catalina/tribes/ChannelException.java
@@ -112,7 +112,9 @@ public class ChannelException extends Exception {
public int addFaultyMember(FaultyMember[] mbrs) {
int result = 0;
for (int i=0; mbrs!=null && i<mbrs.length; i++ ) {
- if ( addFaultyMember(mbrs[i]) ) result++;
+ if ( addFaultyMember(mbrs[i]) ) {
+ result++;
+ }
}
return result;
}
@@ -123,9 +125,14 @@ public class ChannelException extends Exception {
* @return <code>true</code> if the member was added
*/
public boolean addFaultyMember(FaultyMember mbr) {
- if ( this.faultyMembers==null ) this.faultyMembers = new ArrayList<>();
- if ( !faultyMembers.contains(mbr) ) return faultyMembers.add(mbr);
- else return false;
+ if ( this.faultyMembers==null ) {
+ this.faultyMembers = new ArrayList<>();
+ }
+ if ( !faultyMembers.contains(mbr) ) {
+ return faultyMembers.add(mbr);
+ } else {
+ return false;
+ }
}
/**
@@ -133,7 +140,9 @@ public class ChannelException extends Exception {
* @return FaultyMember[]
*/
public FaultyMember[] getFaultyMembers() {
- if ( this.faultyMembers==null ) return EMPTY_LIST;
+ if ( this.faultyMembers==null ) {
+ return EMPTY_LIST;
+ }
return faultyMembers.toArray(new FaultyMember[0]);
}
@@ -174,7 +183,9 @@ public class ChannelException extends Exception {
@Override
public boolean equals(Object o) {
- if (member==null || (!(o instanceof FaultyMember)) || (((FaultyMember)o).member==null)) return false;
+ if (member==null || (!(o instanceof FaultyMember)) || (((FaultyMember)o).member==null)) {
+ return false;
+ }
return member.equals(((FaultyMember)o).member);
}
}
diff --git a/java/org/apache/catalina/tribes/UniqueId.java b/java/org/apache/catalina/tribes/UniqueId.java
index cfb4387..7adb75b 100644
--- a/java/org/apache/catalina/tribes/UniqueId.java
+++ b/java/org/apache/catalina/tribes/UniqueId.java
@@ -47,7 +47,9 @@ public final class UniqueId implements Serializable{
@Override
public int hashCode() {
- if ( id == null ) return 0;
+ if ( id == null ) {
+ return 0;
+ }
return Arrays.hashCode(id);
}
@@ -56,10 +58,15 @@ public final class UniqueId implements Serializable{
boolean result = (other instanceof UniqueId);
if ( result ) {
UniqueId uid = (UniqueId)other;
- if ( this.id == null && uid.id == null ) result = true;
- else if ( this.id == null && uid.id != null ) result = false;
- else if ( this.id != null && uid.id == null ) result = false;
- else result = Arrays.equals(this.id,uid.id);
+ if ( this.id == null && uid.id == null ) {
+ result = true;
+ } else if ( this.id == null && uid.id != null ) {
+ result = false;
+ } else if ( this.id != null && uid.id == null ) {
+ result = false;
+ } else {
+ result = Arrays.equals(this.id,uid.id);
+ }
}//end if
return result;
}
diff --git a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
index 974c606..4284264 100644
--- a/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
+++ b/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
@@ -52,12 +52,16 @@ public class AbsoluteOrder {
public static void absoluteOrder(Member[] members) {
- if ( members == null || members.length <= 1 ) return;
+ if ( members == null || members.length <= 1 ) {
+ return;
+ }
Arrays.sort(members,comp);
}
public static void absoluteOrder(List<Member> members) {
- if ( members == null || members.size() <= 1 ) return;
+ if ( members == null || members.size() <= 1 ) {
+ return;
+ }
java.util.Collections.sort(members, comp);
}
@@ -69,8 +73,12 @@ public class AbsoluteOrder {
@Override
public int compare(Member m1, Member m2) {
int result = compareIps(m1,m2);
- if ( result == 0 ) result = comparePorts(m1,m2);
- if ( result == 0 ) result = compareIds(m1,m2);
+ if ( result == 0 ) {
+ result = comparePorts(m1,m2);
+ }
+ if ( result == 0 ) {
+ result = compareIds(m1,m2);
+ }
return result;
}
diff --git a/java/org/apache/catalina/tribes/group/ChannelCoordinator.java b/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
index c2d162d..b838d30 100644
--- a/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
+++ b/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
@@ -74,7 +74,9 @@ public class ChannelCoordinator extends ChannelInterceptorBase implements Messag
@Override
public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload)
throws ChannelException {
- if ( destination == null ) destination = membershipService.getMembers();
+ if ( destination == null ) {
+ destination = membershipService.getMembers();
+ }
if ((msg.getOptions()&Channel.SEND_OPTIONS_MULTICAST) == Channel.SEND_OPTIONS_MULTICAST) {
membershipService.broadcast(msg);
} else {
@@ -138,8 +140,14 @@ public class ChannelCoordinator extends ChannelInterceptorBase implements Messag
//make sure we don't pass down any flags that are unrelated to the bottom layer
svc = svc & Channel.DEFAULT;
- if (startLevel == Channel.DEFAULT) return; //we have already started up all components
- if (svc == 0 ) return;//nothing to start
+ if (startLevel == Channel.DEFAULT)
+ {
+ return; //we have already started up all components
+ }
+ if (svc == 0 )
+ {
+ return;//nothing to start
+ }
if (svc == (svc & startLevel)) {
throw new ChannelException(sm.getString("channelCoordinator.alreadyStarted",
@@ -217,8 +225,14 @@ public class ChannelCoordinator extends ChannelInterceptorBase implements Messag
//make sure we don't pass down any flags that are unrelated to the bottom layer
svc = svc & Channel.DEFAULT;
- if (startLevel == 0) return; //we have already stopped up all components
- if (svc == 0 ) return;//nothing to stop
+ if (startLevel == 0)
+ {
+ return; //we have already stopped up all components
+ }
+ if (svc == 0 )
+ {
+ return;//nothing to stop
+ }
boolean valid = false;
if ( Channel.SND_RX_SEQ==(svc & Channel.SND_RX_SEQ) ) {
@@ -297,7 +311,9 @@ public class ChannelCoordinator extends ChannelInterceptorBase implements Messag
this.clusterReceiver = clusterReceiver;
this.clusterReceiver.setMessageListener(this);
} else {
- if (this.clusterReceiver!=null ) this.clusterReceiver.setMessageListener(null);
+ if (this.clusterReceiver!=null ) {
+ this.clusterReceiver.setMessageListener(null);
+ }
this.clusterReceiver = null;
}
}
@@ -313,7 +329,9 @@ public class ChannelCoordinator extends ChannelInterceptorBase implements Messag
@Override
public void heartbeat() {
- if ( clusterSender!=null ) clusterSender.heartbeat();
+ if ( clusterSender!=null ) {
+ clusterSender.heartbeat();
+ }
super.heartbeat();
}
diff --git a/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java b/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
index 17ce382..9e0519c 100644
--- a/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
+++ b/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
@@ -46,7 +46,9 @@ public abstract class ChannelInterceptorBase implements ChannelInterceptor {
}
public boolean okToProcess(int messageFlags) {
- if (this.optionFlag == 0 ) return true;
+ if (this.optionFlag == 0 ) {
+ return true;
+ }
return ((optionFlag&messageFlags) == optionFlag);
}
@@ -83,29 +85,39 @@ public abstract class ChannelInterceptorBase implements ChannelInterceptor {
@Override
public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws
ChannelException {
- if (getNext() != null) getNext().sendMessage(destination, msg, payload);
+ if (getNext() != null) {
+ getNext().sendMessage(destination, msg, payload);
+ }
}
@Override
public void messageReceived(ChannelMessage msg) {
- if (getPrevious() != null) getPrevious().messageReceived(msg);
+ if (getPrevious() != null) {
+ getPrevious().messageReceived(msg);
+ }
}
@Override
public void memberAdded(Member member) {
//notify upwards
- if (getPrevious() != null) getPrevious().memberAdded(member);
+ if (getPrevious() != null) {
+ getPrevious().memberAdded(member);
+ }
}
@Override
public void memberDisappeared(Member member) {
//notify upwards
- if (getPrevious() != null) getPrevious().memberDisappeared(member);
+ if (getPrevious() != null) {
+ getPrevious().memberDisappeared(member);
+ }
}
@Override
public void heartbeat() {
- if (getNext() != null) getNext().heartbeat();
+ if (getNext() != null) {
+ getNext().heartbeat();
+ }
}
/**
@@ -113,8 +125,11 @@ public abstract class ChannelInterceptorBase implements ChannelInterceptor {
*/
@Override
public boolean hasMembers() {
- if ( getNext()!=null )return getNext().hasMembers();
- else return false;
+ if ( getNext()!=null ) {
+ return getNext().hasMembers();
+ } else {
+ return false;
+ }
}
/**
@@ -123,8 +138,11 @@ public abstract class ChannelInterceptorBase implements ChannelInterceptor {
*/
@Override
public Member[] getMembers() {
- if ( getNext()!=null ) return getNext().getMembers();
- else return null;
+ if ( getNext()!=null ) {
+ return getNext().getMembers();
+ } else {
+ return null;
+ }
}
/**
@@ -134,8 +152,11 @@ public abstract class ChannelInterceptorBase implements ChannelInterceptor {
*/
@Override
public Member getMember(Member mbr) {
- if ( getNext()!=null) return getNext().getMember(mbr);
- else return null;
+ if ( getNext()!=null) {
+ return getNext().getMember(mbr);
+ } else {
+ return null;
+ }
}
/**
@@ -145,8 +166,11 @@ public abstract class ChannelInterceptorBase implements ChannelInterceptor {
*/
@Override
public Member getLocalMember(boolean incAlive) {
- if ( getNext()!=null ) return getNext().getLocalMember(incAlive);
- else return null;
+ if ( getNext()!=null ) {
+ return getNext().getLocalMember(incAlive);
+ } else {
+ return null;
+ }
}
/**
@@ -162,11 +186,15 @@ public abstract class ChannelInterceptorBase implements ChannelInterceptor {
*/
@Override
public void start(int svc) throws ChannelException {
- if ( getNext()!=null ) getNext().start(svc);
+ if ( getNext()!=null ) {
+ getNext().start(svc);
+ }
// register jmx
JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel);
- if (jmxRegistry != null) this.oname = jmxRegistry.registerJmx(
- ",component=Interceptor,interceptorName=" + getClass().getSimpleName(), this);
+ if (jmxRegistry != null) {
+ this.oname = jmxRegistry.registerJmx(
+ ",component=Interceptor,interceptorName=" + getClass().getSimpleName(), this);
+ }
}
/**
@@ -182,7 +210,9 @@ public abstract class ChannelInterceptorBase implements ChannelInterceptor {
*/
@Override
public void stop(int svc) throws ChannelException {
- if (getNext() != null) getNext().stop(svc);
+ if (getNext() != null) {
+ getNext().stop(svc);
+ }
if (oname != null) {
JmxRegistry.getRegistry(channel).unregisterJmx(oname);
oname = null;
diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java b/java/org/apache/catalina/tribes/group/GroupChannel.java
index cee9baa..4d80854 100644
--- a/java/org/apache/catalina/tribes/group/GroupChannel.java
+++ b/java/org/apache/catalina/tribes/group/GroupChannel.java
@@ -190,11 +190,15 @@ public class GroupChannel extends ChannelInterceptorBase
super.heartbeat();
for (MembershipListener listener : membershipListeners) {
- if ( listener instanceof Heartbeat ) ((Heartbeat)listener).heartbeat();
+ if ( listener instanceof Heartbeat ) {
+ ((Heartbeat)listener).heartbeat();
+ }
}
for (ChannelListener listener : channelListeners) {
- if ( listener instanceof Heartbeat ) ((Heartbeat)listener).heartbeat();
+ if ( listener instanceof Heartbeat ) {
+ ((Heartbeat)listener).heartbeat();
+ }
}
}
@@ -233,7 +237,9 @@ public class GroupChannel extends ChannelInterceptorBase
@Override
public UniqueId send(Member[] destination, Serializable msg, int options, ErrorHandler handler)
throws ChannelException {
- if ( msg == null ) throw new ChannelException(sm.getString("groupChannel.nullMessage"));
+ if ( msg == null ) {
+ throw new ChannelException(sm.getString("groupChannel.nullMessage"));
+ }
XByteBuffer buffer = null;
try {
if (destination == null || destination.length == 0) {
@@ -273,7 +279,9 @@ public class GroupChannel extends ChannelInterceptorBase
} catch (RuntimeException | IOException e) {
throw new ChannelException(e);
} finally {
- if ( buffer != null ) BufferPool.getBufferPool().returnBuffer(buffer);
+ if ( buffer != null ) {
+ BufferPool.getBufferPool().returnBuffer(buffer);
+ }
}
}
@@ -289,7 +297,9 @@ public class GroupChannel extends ChannelInterceptorBase
*/
@Override
public void messageReceived(ChannelMessage msg) {
- if ( msg == null ) return;
+ if ( msg == null ) {
+ return;
+ }
try {
if ( Logs.MESSAGES.isTraceEnabled() ) {
Logs.MESSAGES.trace("GroupChannel - Received msg:" +
@@ -325,7 +335,9 @@ public class GroupChannel extends ChannelInterceptorBase
delivered = true;
//if the message was accepted by an RPC channel, that channel
//is responsible for returning the reply, otherwise we send an absence reply
- if (channelListener instanceof RpcChannel) rx = true;
+ if (channelListener instanceof RpcChannel) {
+ rx = true;
+ }
}
}//for
if ((!rx) && (fwd instanceof RpcMessage)) {
@@ -341,7 +353,9 @@ public class GroupChannel extends ChannelInterceptorBase
} catch ( Exception x ) {
//this could be the channel listener throwing an exception, we should log it
//as a warning.
- if ( log.isWarnEnabled() ) log.warn(sm.getString("groupChannel.receiving.error"),x);
+ if ( log.isWarnEnabled() ) {
+ log.warn(sm.getString("groupChannel.receiving.error"),x);
+ }
throw new RemoteProcessException("Exception:"+x.getMessage(),x);
}
}
@@ -356,7 +370,9 @@ public class GroupChannel extends ChannelInterceptorBase
protected void sendNoRpcChannelReply(RpcMessage msg, Member destination) {
try {
//avoid circular loop
- if ( msg instanceof RpcMessage.NoRpcChannelReply) return;
+ if ( msg instanceof RpcMessage.NoRpcChannelReply) {
+ return;
+ }
RpcMessage.NoRpcChannelReply reply =
new RpcMessage.NoRpcChannelReply(msg.rpcId, msg.uuid);
send(new Member[]{destination},reply,Channel.SEND_OPTIONS_ASYNCHRONOUS);
@@ -374,7 +390,9 @@ public class GroupChannel extends ChannelInterceptorBase
public void memberAdded(Member member) {
//notify upwards
for (MembershipListener membershipListener : membershipListeners) {
- if (membershipListener != null) membershipListener.memberAdded(member);
+ if (membershipListener != null) {
+ membershipListener.memberAdded(member);
+ }
}
}
@@ -387,7 +405,9 @@ public class GroupChannel extends ChannelInterceptorBase
public void memberDisappeared(Member member) {
//notify upwards
for (MembershipListener membershipListener : membershipListeners) {
- if (membershipListener != null) membershipListener.memberDisappeared(member);
+ if (membershipListener != null) {
+ membershipListener.memberDisappeared(member);
+ }
}
}
@@ -439,8 +459,10 @@ public class GroupChannel extends ChannelInterceptorBase
}//end if
first = first.getNext();
}//while
- if ( conflicts.length() > 0 ) throw new ChannelException(sm.getString("groupChannel.optionFlag.conflict",
- conflicts.toString()));
+ if ( conflicts.length() > 0 ) {
+ throw new ChannelException(sm.getString("groupChannel.optionFlag.conflict",
+ conflicts.toString()));
+ }
}
@@ -453,10 +475,14 @@ public class GroupChannel extends ChannelInterceptorBase
@Override
public synchronized void start(int svc) throws ChannelException {
setupDefaultStack();
- if (optionCheck) checkOptionFlags();
+ if (optionCheck) {
+ checkOptionFlags();
+ }
// register jmx
JmxRegistry jmxRegistry = JmxRegistry.getRegistry(this);
- if (jmxRegistry != null) this.oname = jmxRegistry.registerJmx(",component=Channel", this);
+ if (jmxRegistry != null) {
+ this.oname = jmxRegistry.registerJmx(",component=Channel", this);
+ }
super.start(svc);
if ( hbthread == null && heartbeat ) {
hbthread = new HeartbeatThread(this,heartbeatSleeptime);
@@ -488,8 +514,11 @@ public class GroupChannel extends ChannelInterceptorBase
* @return ChannelInterceptor
*/
public ChannelInterceptor getFirstInterceptor() {
- if (interceptors != null) return interceptors;
- else return coordinator;
+ if (interceptors != null) {
+ return interceptors;
+ } else {
+ return coordinator;
+ }
}
/**
@@ -553,8 +582,9 @@ public class GroupChannel extends ChannelInterceptorBase
*/
@Override
public void addMembershipListener(MembershipListener membershipListener) {
- if (!this.membershipListeners.contains(membershipListener) )
+ if (!this.membershipListeners.contains(membershipListener) ) {
this.membershipListeners.add(membershipListener);
+ }
}
/**
@@ -784,7 +814,9 @@ public class GroupChannel extends ChannelInterceptorBase
super();
this.setPriority(MIN_PRIORITY);
String channelName = "";
- if (channel.getName() != null) channelName = "[" + channel.getName() + "]";
+ if (channel.getName() != null) {
+ channelName = "[" + channel.getName() + "]";
+ }
setName("GroupChannel-Heartbeat" + channelName + "-" +inc());
setDaemon(true);
this.channel = channel;
diff --git a/java/org/apache/catalina/tribes/group/RpcChannel.java b/java/org/apache/catalina/tribes/group/RpcChannel.java
index 2c21659..476ec84 100644
--- a/java/org/apache/catalina/tribes/group/RpcChannel.java
+++ b/java/org/apache/catalina/tribes/group/RpcChannel.java
@@ -83,7 +83,9 @@ public class RpcChannel implements ChannelListener {
int channelOptions,
long timeout) throws ChannelException {
- if ( destination==null || destination.length == 0 ) return new Response[0];
+ if ( destination==null || destination.length == 0 ) {
+ return new Response[0];
+ }
//avoid dead lock
int sendOptions =
@@ -93,10 +95,14 @@ public class RpcChannel implements ChannelListener {
RpcCollector collector = new RpcCollector(key,rpcOptions,destination.length);
try {
synchronized (collector) {
- if ( rpcOptions != NO_REPLY ) responseMap.put(key, collector);
+ if ( rpcOptions != NO_REPLY ) {
+ responseMap.put(key, collector);
+ }
RpcMessage rmsg = new RpcMessage(rpcId, key.id, message);
channel.send(destination, rmsg, sendOptions);
- if ( rpcOptions != NO_REPLY ) collector.wait(timeout);
+ if ( rpcOptions != NO_REPLY ) {
+ collector.wait(timeout);
+ }
}
} catch ( InterruptedException ix ) {
Thread.currentThread().interrupt();
@@ -113,20 +119,25 @@ public class RpcChannel implements ChannelListener {
if ( rmsg.reply ) {
RpcCollector collector = responseMap.get(key);
if (collector == null) {
- if (!(rmsg instanceof RpcMessage.NoRpcChannelReply))
+ if (!(rmsg instanceof RpcMessage.NoRpcChannelReply)) {
callback.leftOver(rmsg.message, sender);
+ }
} else {
synchronized (collector) {
//make sure it hasn't been removed
if ( responseMap.containsKey(key) ) {
- if ( (rmsg instanceof RpcMessage.NoRpcChannelReply) )
+ if ( (rmsg instanceof RpcMessage.NoRpcChannelReply) ) {
collector.destcnt--;
- else
+ } else {
collector.addResponse(rmsg.message, sender);
- if (collector.isComplete()) collector.notifyAll();
+ }
+ if (collector.isComplete()) {
+ collector.notifyAll();
+ }
} else {
- if (! (rmsg instanceof RpcMessage.NoRpcChannelReply) )
+ if (! (rmsg instanceof RpcMessage.NoRpcChannelReply) ) {
callback.leftOver(rmsg.message, sender);
+ }
}
}//synchronized
}//end if
@@ -188,7 +199,9 @@ public class RpcChannel implements ChannelListener {
if ( msg instanceof RpcMessage ) {
RpcMessage rmsg = (RpcMessage)msg;
return Arrays.equals(rmsg.rpcId,rpcId);
- } else return false;
+ } else {
+ return false;
+ }
}
public Channel getChannel() {
@@ -246,7 +259,9 @@ public class RpcChannel implements ChannelListener {
}
public boolean isComplete() {
- if ( destcnt <= 0 ) return true;
+ if ( destcnt <= 0 ) {
+ return true;
+ }
switch (options) {
case ALL_REPLY:
return destcnt == responses.size();
@@ -270,7 +285,9 @@ public class RpcChannel implements ChannelListener {
if ( o instanceof RpcCollector ) {
RpcCollector r = (RpcCollector)o;
return r.key.equals(this.key);
- } else return false;
+ } else {
+ return false;
+ }
}
public Response[] getResponses() {
@@ -294,7 +311,9 @@ public class RpcChannel implements ChannelListener {
if ( o instanceof RpcCollectorKey ) {
RpcCollectorKey r = (RpcCollectorKey)o;
return Arrays.equals(id,r.id);
- } else return false;
+ } else {
+ return false;
+ }
}
}
diff --git a/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
index 0b9a3c5..37bf826 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
@@ -53,8 +53,9 @@ public class DomainFilterInterceptor extends ChannelInterceptorBase
} else {
if (logCounter.incrementAndGet() >= logInterval) {
logCounter.set(0);
- if (log.isWarnEnabled())
+ if (log.isWarnEnabled()) {
log.warn(sm.getString("domainFilterInterceptor.message.refused", msg.getAddress()));
+ }
}
}
}//messageReceived
@@ -62,45 +63,63 @@ public class DomainFilterInterceptor extends ChannelInterceptorBase
@Override
public void memberAdded(Member member) {
- if ( membership == null ) setupMembership();
+ if ( membership == null ) {
+ setupMembership();
+ }
boolean notify = false;
synchronized (membership) {
notify = Arrays.equals(domain,member.getDomain());
- if ( notify ) notify = membership.memberAlive(member);
+ if ( notify ) {
+ notify = membership.memberAlive(member);
+ }
}
if ( notify ) {
super.memberAdded(member);
} else {
- if(log.isInfoEnabled()) log.info(sm.getString("domainFilterInterceptor.member.refused", member));
+ if(log.isInfoEnabled()) {
+ log.info(sm.getString("domainFilterInterceptor.member.refused", member));
+ }
}
}
@Override
public void memberDisappeared(Member member) {
- if ( membership == null ) setupMembership();
+ if ( membership == null ) {
+ setupMembership();
+ }
boolean notify = false;
synchronized (membership) {
notify = Arrays.equals(domain,member.getDomain());
- if ( notify ) membership.removeMember(member);
+ if ( notify ) {
+ membership.removeMember(member);
+ }
+ }
+ if ( notify ) {
+ super.memberDisappeared(member);
}
- if ( notify ) super.memberDisappeared(member);
}
@Override
public boolean hasMembers() {
- if ( membership == null ) setupMembership();
+ if ( membership == null ) {
+ setupMembership();
+ }
return membership.hasMembers();
}
@Override
public Member[] getMembers() {
- if ( membership == null ) setupMembership();
+ if ( membership == null ) {
+ setupMembership();
+ }
return membership.getMembers();
}
@Override
public Member getMember(Member mbr) {
- if ( membership == null ) setupMembership();
+ if ( membership == null ) {
+ setupMembership();
+ }
return membership.getMember(mbr);
}
@@ -127,11 +146,14 @@ public class DomainFilterInterceptor extends ChannelInterceptorBase
}
public void setDomain(String domain) {
- if ( domain == null ) return;
- if (domain.startsWith("{"))
+ if ( domain == null ) {
+ return;
+ }
+ if (domain.startsWith("{")) {
setDomain(org.apache.catalina.tribes.util.Arrays.fromString(domain));
- else
+ } else {
setDomain(org.apache.catalina.tribes.util.Arrays.convert(domain));
+ }
}
@Override
diff --git a/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
index d98b5d8..e2a48f7 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
@@ -91,8 +91,9 @@ public class EncryptInterceptor extends ChannelInterceptorBase implements Encryp
private void validateChannelChain() throws ChannelException {
ChannelInterceptor interceptor = getPrevious();
while(null != interceptor) {
- if(interceptor instanceof TcpFailureDetector)
+ if(interceptor instanceof TcpFailureDetector) {
throw new ChannelConfigException(sm.getString("encryptInterceptor.tcpFailureDetector.ordering"));
+ }
interceptor = interceptor.getPrevious();
}
@@ -163,15 +164,18 @@ public class EncryptInterceptor extends ChannelInterceptorBase implements Encryp
*/
@Override
public void setEncryptionAlgorithm(String algorithm) {
- if(null == getEncryptionAlgorithm())
+ if(null == getEncryptionAlgorithm()) {
throw new IllegalStateException(sm.getString("encryptInterceptor.algorithm.required"));
+ }
int pos = algorithm.indexOf('/');
- if(pos < 0)
+ if(pos < 0) {
throw new IllegalArgumentException(sm.getString("encryptInterceptor.algorithm.required"));
+ }
pos = algorithm.indexOf('/', pos + 1);
- if(pos < 0)
+ if(pos < 0) {
throw new IllegalArgumentException(sm.getString("encryptInterceptor.algorithm.required"));
+ }
encryptionAlgorithm = algorithm;
}
@@ -228,8 +232,9 @@ public class EncryptInterceptor extends ChannelInterceptorBase implements Encryp
public byte[] getEncryptionKey() {
byte[] key = getEncryptionKeyInternal();
- if(null != key)
+ if(null != key) {
key = key.clone();
+ }
return key;
}
@@ -317,8 +322,9 @@ public class EncryptInterceptor extends ChannelInterceptorBase implements Encryp
private static BaseEncryptionManager createEncryptionManager(String algorithm,
byte[] encryptionKey, String providerName)
throws NoSuchAlgorithmException, NoSuchPaddingException, NoSuchProviderException {
- if(null == encryptionKey)
+ if(null == encryptionKey) {
throw new IllegalStateException(sm.getString("encryptInterceptor.key.required"));
+ }
String algorithmName;
String algorithmMode;
@@ -341,16 +347,17 @@ public class EncryptInterceptor extends ChannelInterceptorBase implements Encryp
algorithmMode = "CBC";
}
- if("GCM".equalsIgnoreCase(algorithmMode))
+ if("GCM".equalsIgnoreCase(algorithmMode)) {
return new GCMEncryptionManager(algorithm, new SecretKeySpec(encryptionKey, algorithmName), providerName);
- else if("CBC".equalsIgnoreCase(algorithmMode)
+ } else if("CBC".equalsIgnoreCase(algorithmMode)
|| "OFB".equalsIgnoreCase(algorithmMode)
- || "CFB".equalsIgnoreCase(algorithmMode))
+ || "CFB".equalsIgnoreCase(algorithmMode)) {
return new BaseEncryptionManager(algorithm,
new SecretKeySpec(encryptionKey, algorithmName),
providerName);
- else
+ } else {
throw new IllegalArgumentException(sm.getString("encryptInterceptor.algorithm.unsupported-mode", algorithmMode));
+ }
}
private static class BaseEncryptionManager {
@@ -502,8 +509,9 @@ public class EncryptInterceptor extends ChannelInterceptorBase implements Encryp
return data;
} finally {
- if(null != cipher)
+ if(null != cipher) {
returnCipher(cipher);
+ }
}
}
@@ -530,8 +538,9 @@ public class EncryptInterceptor extends ChannelInterceptorBase implements Encryp
// Decrypt remainder of the message.
return cipher.doFinal(bytes, ivSize, bytes.length - ivSize);
} finally {
- if(null != cipher)
+ if(null != cipher) {
returnCipher(cipher);
+ }
}
}
@@ -550,8 +559,9 @@ public class EncryptInterceptor extends ChannelInterceptorBase implements Encryp
return ivBytes;
} finally {
- if(null != random)
+ if(null != random) {
returnRandom(random);
+ }
}
}
diff --git a/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
index 872f66a..f4be81b 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
@@ -146,8 +146,9 @@ public class FragmentationInterceptor extends ChannelInterceptorBase implements
Object[] keys = set.toArray();
for (Object o : keys) {
FragKey key = (FragKey) o;
- if (key != null && key.expired(getExpire()))
+ if (key != null && key.expired(getExpire())) {
removeFragCollection(key);
+ }
}
}catch ( Exception x ) {
if ( log.isErrorEnabled() ) {
@@ -201,12 +202,16 @@ public class FragmentationInterceptor extends ChannelInterceptorBase implements
public boolean complete() {
boolean result = true;
- for ( int i=0; (i<frags.length) && (result); i++ ) result = (frags[i] != null);
+ for ( int i=0; (i<frags.length) && (result); i++ ) {
+ result = (frags[i] != null);
+ }
return result;
}
public ChannelMessage assemble() {
- if ( !complete() ) throw new IllegalStateException(sm.getString("fragmentationInterceptor.fragments.missing"));
+ if ( !complete() ) {
+ throw new IllegalStateException(sm.getString("fragmentationInterceptor.fragments.missing"));
+ }
int buffersize = 0;
for (XByteBuffer frag : frags) {
buffersize += frag.getLength();
@@ -239,7 +244,9 @@ public class FragmentationInterceptor extends ChannelInterceptorBase implements
public boolean equals(Object o ) {
if ( o instanceof FragKey ) {
return Arrays.equals(uniqueId,((FragKey)o).uniqueId);
- } else return false;
+ } else {
+ return false;
+ }
}
diff --git a/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
index ae99817..b589111 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
@@ -113,7 +113,9 @@ public class MessageDispatchInterceptor extends ChannelInterceptorBase
return;
}
String channelName = "";
- if (getChannel().getName() != null) channelName = "[" + getChannel().getName() + "]";
+ if (getChannel().getName() != null) {
+ channelName = "[" + getChannel().getName() + "]";
+ }
executor = ExecutorFactory.newThreadPool(maxSpareThreads, maxThreads, keepAliveTime,
TimeUnit.MILLISECONDS,
new TcclThreadFactory("MessageDispatchInterceptor.MessageDispatchThread" + channelName));
diff --git a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
index 6e947cd..fb89dcc 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
@@ -276,7 +276,9 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
}catch ( ChannelException x ) {
log.warn(sm.getString("nonBlockingCoordinator.electionMessage.sendfailed", msg.getMembers()[current]));
current = Arrays.nextIndex(msg.getMembers()[current],msg.getMembers());
- if ( current == next ) throw x;
+ if ( current == next ) {
+ throw x;
+ }
}
}
}
@@ -297,7 +299,9 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
protected boolean memberAlive(Member mbr, long conTimeout) {
//could be a shutdown notification
- if ( Arrays.equals(mbr.getCommand(),Member.SHUTDOWN_PAYLOAD) ) return false;
+ if ( Arrays.equals(mbr.getCommand(),Member.SHUTDOWN_PAYLOAD) ) {
+ return false;
+ }
try (Socket socket = new Socket()) {
InetAddress ia = InetAddress.getByAddress(mbr.getHost());
@@ -320,8 +324,11 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
Arrays.fill(merged,getMembers());
Member[] diff = Arrays.diff(merged,membership,local);
for (Member member : diff) {
- if (!alive(member)) merged.removeMember(member);
- else memberAdded(member, false);
+ if (!alive(member)) {
+ merged.removeMember(member);
+ } else {
+ memberAdded(member, false);
+ }
}
fireInterceptorEvent(new CoordinationEvent(CoordinationEvent.EVT_POST_MERGE,this,"Post merge"));
return merged;
@@ -333,8 +340,11 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
synchronized (electionMutex) { electionMutex.notifyAll();}
}
Membership merged = mergeOnArrive(msg);
- if (isViewConf(msg)) handleViewConf(msg, merged);
- else handleToken(msg, merged);
+ if (isViewConf(msg)) {
+ handleViewConf(msg, merged);
+ } else {
+ handleToken(msg, merged);
+ }
}
protected void handleToken(CoordinationMessage msg, Membership merged) throws ChannelException {
@@ -382,7 +392,10 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
}
protected void handleViewConf(CoordinationMessage msg, Membership merged) throws ChannelException {
- if ( viewId != null && msg.getId().equals(viewId) ) return;//we already have this view
+ if ( viewId != null && msg.getId().equals(viewId) )
+ {
+ return;//we already have this view
+ }
view = new Membership(getLocalMember(false),AbsoluteOrder.comp,true);
Arrays.fill(view,msg.getMembers());
viewId = msg.getId();
@@ -409,8 +422,12 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
}
protected boolean hasHigherPriority(Member[] complete, Member[] local) {
- if ( local == null || local.length == 0 ) return false;
- if ( complete == null || complete.length == 0 ) return true;
+ if ( local == null || local.length == 0 ) {
+ return false;
+ }
+ if ( complete == null || complete.length == 0 ) {
+ return true;
+ }
AbsoluteOrder.absoluteOrder(complete);
AbsoluteOrder.absoluteOrder(local);
return (AbsoluteOrder.comp.compare(complete[0],local[0]) > 0);
@@ -461,12 +478,18 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
//============================================================================================================
@Override
public void start(int svc) throws ChannelException {
- if (membership == null) setupMembership();
- if (started)return;
+ if (membership == null) {
+ setupMembership();
+ }
+ if (started) {
+ return;
+ }
fireInterceptorEvent(new CoordinationEvent(CoordinationEvent.EVT_START, this, "Before start"));
super.start(startsvc);
started = true;
- if (view == null) view = new Membership(super.getLocalMember(true), AbsoluteOrder.comp, true);
+ if (view == null) {
+ view = new Membership(super.getLocalMember(true), AbsoluteOrder.comp, true);
+ }
fireInterceptorEvent(new CoordinationEvent(CoordinationEvent.EVT_START, this, "After start"));
startElection(false);
}
@@ -476,7 +499,9 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
try {
halt();
synchronized (electionMutex) {
- if (!started)return;
+ if (!started) {
+ return;
+ }
started = false;
fireInterceptorEvent(new CoordinationEvent(CoordinationEvent.EVT_STOP, this, "Before stop"));
super.stop(startsvc);
@@ -525,11 +550,17 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
}
public void memberAdded(Member member,boolean elect) {
- if (membership == null) setupMembership();
- if (membership.memberAlive(member)) super.memberAdded(member);
+ if (membership == null) {
+ setupMembership();
+ }
+ if (membership.memberAlive(member)) {
+ super.memberAdded(member);
+ }
try {
fireInterceptorEvent(new CoordinationEvent(CoordinationEvent.EVT_MBR_ADD,this,"Member add("+member.getName()+")"));
- if (started && elect) startElection(false);
+ if (started && elect) {
+ startElection(false);
+ }
} catch (ChannelException x) {
log.error(sm.getString("nonBlockingCoordinator.memberAdded.failed"),x);
}
@@ -542,7 +573,9 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
try {
fireInterceptorEvent(new CoordinationEvent(CoordinationEvent.EVT_MBR_DEL,this,"Member remove("+member.getName()+")"));
if (started && (isCoordinator() || isHighest()))
+ {
startElection(true); //to do, if a member disappears, only the coordinator can start
+ }
} catch (ChannelException x) {
log.error(sm.getString("nonBlockingCoordinator.memberDisappeared.failed"),x);
}
@@ -550,8 +583,11 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
public boolean isHighest() {
Member local = getLocalMember(false);
- if ( membership.getMembers().length == 0 ) return true;
- else return AbsoluteOrder.comp.compare(local,membership.getMembers()[0])<=0;
+ if ( membership.getMembers().length == 0 ) {
+ return true;
+ } else {
+ return AbsoluteOrder.comp.compare(local,membership.getMembers()[0])<=0;
+ }
}
public boolean isCoordinator() {
@@ -615,7 +651,9 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
@Override
public Member getLocalMember(boolean incAlive) {
Member local = super.getLocalMember(incAlive);
- if ( view == null && (local != null)) setupMembership();
+ if ( view == null && (local != null)) {
+ setupMembership();
+ }
return local;
}
@@ -665,27 +703,37 @@ public class NonBlockingCoordinator extends ChannelInterceptorBase {
}
public Member getLeader() {
- if ( leader == null ) parse();
+ if ( leader == null ) {
+ parse();
+ }
return leader;
}
public Member getSource() {
- if ( source == null ) parse();
+ if ( source == null ) {
+ parse();
+ }
return source;
}
public UniqueId getId() {
- if ( id == null ) parse();
+ if ( id == null ) {
+ parse();
+ }
return id;
}
public Member[] getMembers() {
- if ( view == null ) parse();
+ if ( view == null ) {
+ parse();
+ }
return view;
}
public byte[] getType() {
- if (type == null ) parse();
+ if (type == null ) {
+ parse();
+ }
return type;
}
diff --git a/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
index 18d31e3..c98c0a3 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
@@ -89,11 +89,15 @@ public class OrderInterceptor extends ChannelInterceptorBase {
msg.getMessage().trim(4);
}
} catch (ChannelException x) {
- if (cx == null) cx = x;
+ if (cx == null) {
+ cx = x;
+ }
cx.addFaultyMember(x.getFaultyMembers());
}
}//for
- if ( cx != null ) throw cx;
+ if ( cx != null ) {
+ throw cx;
+ }
}
@Override
@@ -107,7 +111,9 @@ public class OrderInterceptor extends ChannelInterceptorBase {
MessageOrder order = new MessageOrder(msgnr,(ChannelMessage)msg.deepclone());
inLock.writeLock().lock();
try {
- if ( processIncoming(order) ) processLeftOvers(msg.getAddress(),false);
+ if ( processIncoming(order) ) {
+ processLeftOvers(msg.getAddress(),false);
+ }
} finally {
inLock.writeLock().unlock();
}
@@ -118,7 +124,9 @@ public class OrderInterceptor extends ChannelInterceptorBase {
Counter cnt = getInCounter(member);
cnt.setCounter(Integer.MAX_VALUE);
}
- if ( tmp!= null ) processIncoming(tmp);
+ if ( tmp!= null ) {
+ processIncoming(tmp);
+ }
}
/**
*
@@ -138,8 +146,11 @@ public class OrderInterceptor extends ChannelInterceptorBase {
while ( (order!=null) && (order.getMsgNr() <= cnt.getCounter()) ) {
//we are right on target. process orders
- if ( order.getMsgNr() == cnt.getCounter() ) cnt.inc();
- else if ( order.getMsgNr() > cnt.getCounter() ) cnt.setCounter(order.getMsgNr());
+ if ( order.getMsgNr() == cnt.getCounter() ) {
+ cnt.inc();
+ } else if ( order.getMsgNr() > cnt.getCounter() ) {
+ cnt.setCounter(order.getMsgNr());
+ }
super.messageReceived(order.getMessage());
order.setMessage(null);
order = order.next;
@@ -153,21 +164,29 @@ public class OrderInterceptor extends ChannelInterceptorBase {
//process expired messages or empty out the queue
if ( tmp.isExpired(expire) || empty ) {
//reset the head
- if ( tmp == head ) head = tmp.next;
+ if ( tmp == head ) {
+ head = tmp.next;
+ }
cnt.setCounter(tmp.getMsgNr()+1);
- if ( getForwardExpired() )
+ if ( getForwardExpired() ) {
super.messageReceived(tmp.getMessage());
+ }
tmp.setMessage(null);
tmp = tmp.next;
- if ( prev != null ) prev.next = tmp;
+ if ( prev != null ) {
+ prev.next = tmp;
+ }
result = true;
} else {
prev = tmp;
tmp = tmp.next;
}
}
- if ( head == null ) incoming.remove(member);
- else incoming.put(member, head);
+ if ( head == null ) {
+ incoming.remove(member);
+ } else {
+ incoming.put(member, head);
+ }
return result;
}
@@ -269,9 +288,15 @@ public class OrderInterceptor extends ChannelInterceptorBase {
@SuppressWarnings("null") // prev cannot be null
public static MessageOrder add(MessageOrder head, MessageOrder add) {
- if ( head == null ) return add;
- if ( add == null ) return head;
- if ( head == add ) return add;
+ if ( head == null ) {
+ return add;
+ }
+ if ( add == null ) {
+ return head;
+ }
+ if ( head == add ) {
+ return add;
+ }
if ( head.getMsgNr() > add.getMsgNr() ) {
add.next = head;
diff --git a/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
index c120e1c..3e3ca23 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
@@ -56,13 +56,17 @@ public class StaticMembershipInterceptor extends ChannelInterceptorBase
public void addStaticMember(Member member) {
synchronized (members) {
- if (!members.contains(member)) members.add(member);
+ if (!members.contains(member)) {
+ members.add(member);
+ }
}
}
public void removeStaticMember(Member member) {
synchronized (members) {
- if (members.contains(member)) members.remove(member);
+ if (members.contains(member)) {
+ members.remove(member);
+ }
}
}
@@ -111,13 +115,18 @@ public class StaticMembershipInterceptor extends ChannelInterceptorBase
*/
@Override
public Member[] getMembers() {
- if ( members.size() == 0 ) return super.getMembers();
- else {
+ if ( members.size() == 0 ) {
+ return super.getMembers();
+ } else {
synchronized (members) {
Member[] others = super.getMembers();
Member[] result = new Member[members.size() + others.length];
- for (int i = 0; i < others.length; i++) result[i] = others[i];
- for (int i = 0; i < members.size(); i++) result[i + others.length] = members.get(i);
+ for (int i = 0; i < others.length; i++) {
+ result[i] = others[i];
+ }
+ for (int i = 0; i < members.size(); i++) {
+ result[i + others.length] = members.get(i);
+ }
AbsoluteOrder.absoluteOrder(result);
return result;
}//sync
@@ -131,8 +140,11 @@ public class StaticMembershipInterceptor extends ChannelInterceptorBase
*/
@Override
public Member getMember(Member mbr) {
- if ( members.contains(mbr) ) return members.get(members.indexOf(mbr));
- else return super.getMember(mbr);
+ if ( members.contains(mbr) ) {
+ return members.get(members.indexOf(mbr));
+ } else {
+ return super.getMember(mbr);
+ }
}
/**
@@ -142,8 +154,11 @@ public class StaticMembershipInterceptor extends ChannelInterceptorBase
*/
@Override
public Member getLocalMember(boolean incAlive) {
- if (this.localMember != null ) return localMember;
- else return super.getLocalMember(incAlive);
+ if (this.localMember != null ) {
+ return localMember;
+ } else {
+ return super.getLocalMember(incAlive);
+ }
}
/**
@@ -153,8 +168,12 @@ public class StaticMembershipInterceptor extends ChannelInterceptorBase
*/
@Override
public void start(int svc) throws ChannelException {
- if ( (Channel.SND_RX_SEQ&svc)==Channel.SND_RX_SEQ ) super.start(Channel.SND_RX_SEQ);
- if ( (Channel.SND_TX_SEQ&svc)==Channel.SND_TX_SEQ ) super.start(Channel.SND_TX_SEQ);
+ if ( (Channel.SND_RX_SEQ&svc)==Channel.SND_RX_SEQ ) {
+ super.start(Channel.SND_RX_SEQ);
+ }
+ if ( (Channel.SND_TX_SEQ&svc)==Channel.SND_TX_SEQ ) {
+ super.start(Channel.SND_TX_SEQ);
+ }
final ChannelInterceptorBase base = this;
for (final Member member : members) {
Thread t = new Thread() {
@@ -175,8 +194,12 @@ public class StaticMembershipInterceptor extends ChannelInterceptorBase
TcpPingInterceptor pingInterceptor = null;
ChannelInterceptor prev = getPrevious();
while (prev != null) {
- if (prev instanceof TcpFailureDetector ) failureDetector = (TcpFailureDetector) prev;
- if (prev instanceof TcpPingInterceptor) pingInterceptor = (TcpPingInterceptor) prev;
+ if (prev instanceof TcpFailureDetector ) {
+ failureDetector = (TcpFailureDetector) prev;
+ }
+ if (prev instanceof TcpPingInterceptor) {
+ pingInterceptor = (TcpPingInterceptor) prev;
+ }
prev = prev.getPrevious();
}
if (failureDetector == null) {
@@ -227,7 +250,9 @@ public class StaticMembershipInterceptor extends ChannelInterceptorBase
}
protected void sendMemberMessage(Member[] members, byte[] message) throws ChannelException {
- if ( members == null || members.length == 0 ) return;
+ if ( members == null || members.length == 0 ) {
+ return;
+ }
ChannelData data = new ChannelData(true);
data.setAddress(getLocalMember(false));
data.setTimestamp(System.currentTimeMillis());
diff --git a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
index 7d0e857..8e01d0c 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
@@ -114,14 +114,19 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai
}//end if
//ignore the message, it doesnt have the flag set
- if ( process ) super.messageReceived(msg);
- else if ( log.isDebugEnabled() ) log.debug("Received a failure detector packet:"+msg);
+ if ( process ) {
+ super.messageReceived(msg);
+ } else if ( log.isDebugEnabled() ) {
+ log.debug("Received a failure detector packet:"+msg);
+ }
}//messageReceived
@Override
public void memberAdded(Member member) {
- if ( membership == null ) setupMembership();
+ if ( membership == null ) {
+ setupMembership();
+ }
boolean notify = false;
synchronized (membership) {
if (removeSuspects.containsKey(member)) {
@@ -140,16 +145,22 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai
}
}
}
- if ( notify ) super.memberAdded(member);
+ if ( notify ) {
+ super.memberAdded(member);
+ }
}
@Override
public void memberDisappeared(Member member) {
- if ( membership == null ) setupMembership();
+ if ( membership == null ) {
+ setupMembership();
+ }
boolean shutdown = Arrays.equals(member.getCommand(),Member.SHUTDOWN_PAYLOAD);
if (shutdown) {
synchronized (membership) {
- if (!membership.contains(member)) return;
+ if (!membership.contains(member)) {
+ return;
+ }
membership.removeMember(member);
removeSuspects.remove(member);
if (member instanceof StaticMember) {
@@ -159,12 +170,14 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai
super.memberDisappeared(member);
} else {
boolean notify = false;
- if(log.isInfoEnabled())
+ if(log.isInfoEnabled()) {
log.info(sm.getString("tcpFailureDetector.memberDisappeared.verify", member));
+ }
synchronized (membership) {
if (!membership.contains(member)) {
- if(log.isInfoEnabled())
+ if(log.isInfoEnabled()) {
log.info(sm.getString("tcpFailureDetector.already.disappeared", member));
+ }
return;
}
//check to see if the member really is gone
@@ -182,31 +195,39 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai
}
}
if ( notify ) {
- if(log.isInfoEnabled())
+ if(log.isInfoEnabled()) {
log.info(sm.getString("tcpFailureDetector.member.disappeared", member));
+ }
super.memberDisappeared(member);
} else {
- if(log.isInfoEnabled())
+ if(log.isInfoEnabled()) {
log.info(sm.getString("tcpFailureDetector.still.alive", member));
+ }
}
}
}
@Override
public boolean hasMembers() {
- if ( membership == null ) setupMembership();
+ if ( membership == null ) {
+ setupMembership();
+ }
return membership.hasMembers();
}
@Override
public Member[] getMembers() {
- if ( membership == null ) setupMembership();
+ if ( membership == null ) {
+ setupMembership();
+ }
return membership.getMembers();
}
@Override
public Member getMember(Member mbr) {
- if ( membership == null ) setupMembership();
+ if ( membership == null ) {
+ setupMembership();
+ }
return membership.getMember(mbr);
}
@@ -224,10 +245,15 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai
@Override
public void checkMembers(boolean checkAll) {
try {
- if (membership == null) setupMembership();
+ if (membership == null) {
+ setupMembership();
+ }
synchronized (membership) {
- if (!checkAll) performBasicCheck();
- else performForcedCheck();
+ if (!checkAll) {
+ performBasicCheck();
+ } else {
+ performForcedCheck();
+ }
}
} catch (Exception x) {
log.warn(sm.getString("tcpFailureDetector.heartbeat.failed"),x);
@@ -239,7 +265,9 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai
Member[] members = super.getMembers();
for (int i = 0; members != null && i < members.length; i++) {
if (memberAlive(members[i])) {
- if (membership.memberAlive(members[i])) super.memberAdded(members[i]);
+ if (membership.memberAlive(members[i])) {
+ super.memberAdded(members[i]);
+ }
addSuspects.remove(members[i]);
} else {
if (membership.getMember(members[i])!=null) {
@@ -285,8 +313,9 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai
}
super.memberDisappeared(m);
removeSuspects.remove(m);
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info(sm.getString("tcpFailureDetector.suspectMember.dead", m));
+ }
} else {
if (removeSuspectsTimeout > 0) {
long timeNow = System.currentTimeMillis();
@@ -306,8 +335,9 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai
membership.memberAlive(m);
super.memberAdded(m);
addSuspects.remove(m);
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info(sm.getString("tcpFailureDetector.suspectMember.alive", m));
+ }
} //end if
}
}
@@ -328,7 +358,9 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai
long readTimeout, long conTimeout,
int optionFlag) {
//could be a shutdown notification
- if ( Arrays.equals(mbr.getCommand(),Member.SHUTDOWN_PAYLOAD) ) return false;
+ if ( Arrays.equals(mbr.getCommand(),Member.SHUTDOWN_PAYLOAD) ) {
+ return false;
+ }
try (Socket socket = new Socket()) {
InetAddress ia = InetAddress.getByAddress(mbr.getHost());
@@ -341,8 +373,11 @@ public class TcpFailureDetector extends ChannelInterceptorBase implements TcpFai
data.setMessage(new XByteBuffer(msgData,false));
data.setTimestamp(System.currentTimeMillis());
int options = optionFlag | Channel.SEND_OPTIONS_BYTE_MESSAGE;
- if ( readTest ) options = (options | Channel.SEND_OPTIONS_USE_ACK);
- else options = (options & (~Channel.SEND_OPTIONS_USE_ACK));
+ if ( readTest ) {
+ options = (options | Channel.SEND_OPTIONS_USE_ACK);
+ } else {
+ options = (options & (~Channel.SEND_OPTIONS_USE_ACK));
+ }
data.setOptions(options);
byte[] message = XByteBuffer.createDataPackage(data);
socket.getOutputStream().write(message);
diff --git a/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
index 725f5d3..1671e9c 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
@@ -70,7 +70,9 @@ public class TcpPingInterceptor extends ChannelInterceptorBase implements TcpPin
thread = new PingThread();
thread.setDaemon(true);
String channelName = "";
- if (getChannel().getName() != null) channelName = "[" + getChannel().getName() + "]";
+ if (getChannel().getName() != null) {
+ channelName = "[" + getChannel().getName() + "]";
+ }
thread.setName("TcpPingInterceptor.PingThread" + channelName +"-"+cnt.addAndGet(1));
thread.start();
}
@@ -78,10 +80,12 @@ public class TcpPingInterceptor extends ChannelInterceptorBase implements TcpPin
//acquire the interceptors to invoke on send ping events
ChannelInterceptor next = getNext();
while ( next != null ) {
- if ( next instanceof TcpFailureDetector )
+ if ( next instanceof TcpFailureDetector ) {
failureDetector = new WeakReference<>((TcpFailureDetector)next);
- if ( next instanceof StaticMembershipInterceptor )
+ }
+ if ( next instanceof StaticMembershipInterceptor ) {
staticMembers = new WeakReference<>((StaticMembershipInterceptor)next);
+ }
next = next.getNext();
}
@@ -100,7 +104,9 @@ public class TcpPingInterceptor extends ChannelInterceptorBase implements TcpPin
@Override
public void heartbeat() {
super.heartbeat();
- if (!getUseThread()) sendPing();
+ if (!getUseThread()) {
+ sendPing();
+ }
}
@Override
@@ -148,7 +154,9 @@ public class TcpPingInterceptor extends ChannelInterceptorBase implements TcpPin
}
protected void sendPingMessage(Member[] members) {
- if ( members == null || members.length == 0 ) return;
+ if ( members == null || members.length == 0 ) {
+ return;
+ }
ChannelData data = new ChannelData(true);//generates a unique Id
data.setAddress(getLocalMember(false));
data.setTimestamp(System.currentTimeMillis());
@@ -172,8 +180,11 @@ public class TcpPingInterceptor extends ChannelInterceptorBase implements TcpPin
}//end if
//ignore the message, it doesnt have the flag set
- if ( process ) super.messageReceived(msg);
- else if ( log.isDebugEnabled() ) log.debug("Received a TCP ping packet:"+msg);
+ if ( process ) {
+ super.messageReceived(msg);
+ } else if ( log.isDebugEnabled() ) {
+ log.debug("Received a TCP ping packet:"+msg);
+ }
}//messageReceived
protected class PingThread extends Thread {
diff --git a/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
index 4516ff9..05410b8 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
@@ -54,13 +54,17 @@ public class ThroughputInterceptor extends ChannelInterceptorBase
@Override
public void sendMessage(Member[] destination, ChannelMessage msg, InterceptorPayload payload) throws ChannelException {
- if ( access.addAndGet(1) == 1 ) txStart = System.currentTimeMillis();
+ if ( access.addAndGet(1) == 1 ) {
+ txStart = System.currentTimeMillis();
+ }
long bytes = XByteBuffer.getDataPackageLength(((ChannelData)msg).getDataPackageLength());
try {
super.sendMessage(destination, msg, payload);
}catch ( ChannelException x ) {
msgTxErr.addAndGet(1);
- if ( access.get() == 1 ) access.addAndGet(-1);
+ if ( access.get() == 1 ) {
+ access.addAndGet(-1);
+ }
throw x;
}
mbTx += (bytes*destination.length)/(1024d*1024d);
@@ -78,23 +82,28 @@ public class ThroughputInterceptor extends ChannelInterceptorBase
@Override
public void messageReceived(ChannelMessage msg) {
- if ( rxStart == 0 ) rxStart = System.currentTimeMillis();
+ if ( rxStart == 0 ) {
+ rxStart = System.currentTimeMillis();
+ }
long bytes = XByteBuffer.getDataPackageLength(((ChannelData)msg).getDataPackageLength());
mbRx += bytes/(1024d*1024d);
msgRxCnt.addAndGet(1);
- if ( msgRxCnt.get() % interval == 0 ) report(timeTx);
+ if ( msgRxCnt.get() % interval == 0 ) {
+ report(timeTx);
+ }
super.messageReceived(msg);
}
@Override
public void report(double timeTx) {
- if ( log.isInfoEnabled() )
+ if ( log.isInfoEnabled() ) {
log.info(sm.getString("throughputInterceptor.report",
msgTxCnt, df.format(mbTx), df.format(mbAppTx), df.format(timeTx),
df.format(mbTx/timeTx), df.format(mbAppTx/timeTx), msgTxErr, msgRxCnt,
df.format(mbRx/((System.currentTimeMillis()-rxStart)/(double)1000)),
df.format(mbRx)));
+ }
}
@Override
diff --git a/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java b/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
index 91db287..6da5753 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
@@ -51,8 +51,11 @@ public class TwoPhaseCommitInterceptor extends ChannelInterceptorBase {
if (okToProcess(msg.getOptions()) ) {
super.sendMessage(destination, msg, null);
ChannelMessage confirmation = null;
- if ( deepclone ) confirmation = (ChannelMessage)msg.deepclone();
- else confirmation = (ChannelMessage)msg.clone();
+ if ( deepclone ) {
+ confirmation = (ChannelMessage)msg.deepclone();
+ } else {
+ confirmation = (ChannelMessage)msg.clone();
+ }
confirmation.getMessage().reset();
UUIDGenerator.randomUUID(false,confirmation.getUniqueId(),0);
confirmation.getMessage().append(START_DATA,0,START_DATA.length);
@@ -79,7 +82,9 @@ public class TwoPhaseCommitInterceptor extends ChannelInterceptorBase {
if ( original != null ) {
super.messageReceived(original.msg);
messages.remove(id);
- } else log.warn(sm.getString("twoPhaseCommitInterceptor.originalMessage.missing", Arrays.toString(id.getBytes())));
+ } else {
+ log.warn(sm.getString("twoPhaseCommitInterceptor.originalMessage.missing", Arrays.toString(id.getBytes())));
+ }
} else {
UniqueId id = new UniqueId(msg.getUniqueId());
MapEntry entry = new MapEntry((ChannelMessage)msg.deepclone(),id,System.currentTimeMillis());
diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java b/java/org/apache/catalina/tribes/io/BufferPool.java
index a44a1da..649ff28 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool.java
@@ -43,16 +43,23 @@ public class BufferPool {
}
public XByteBuffer getBuffer(int minSize, boolean discard) {
- if ( pool != null ) return pool.getBuffer(minSize, discard);
- else return new XByteBuffer(minSize,discard);
+ if ( pool != null ) {
+ return pool.getBuffer(minSize, discard);
+ } else {
+ return new XByteBuffer(minSize,discard);
+ }
}
public void returnBuffer(XByteBuffer buffer) {
- if ( pool != null ) pool.returnBuffer(buffer);
+ if ( pool != null ) {
+ pool.returnBuffer(buffer);
+ }
}
public void clear() {
- if ( pool != null ) pool.clear();
+ if ( pool != null ) {
+ pool.clear();
+ }
}
diff --git a/java/org/apache/catalina/tribes/io/ChannelData.java b/java/org/apache/catalina/tribes/io/ChannelData.java
index c9b1ed3..512b79d 100644
--- a/java/org/apache/catalina/tribes/io/ChannelData.java
+++ b/java/org/apache/catalina/tribes/io/ChannelData.java
@@ -73,7 +73,9 @@ public class ChannelData implements ChannelMessage {
* @param generateUUID boolean - if true, a unique Id will be generated
*/
public ChannelData(boolean generateUUID) {
- if ( generateUUID ) generateUUID();
+ if ( generateUUID ) {
+ generateUUID();
+ }
}
@@ -293,7 +295,9 @@ public class ChannelData implements ChannelMessage {
public boolean equals(Object o) {
if ( o instanceof ChannelData ) {
return Arrays.equals(getUniqueId(),((ChannelData)o).getUniqueId());
- } else return false;
+ } else {
+ return false;
+ }
}
/**
@@ -365,7 +369,9 @@ public class ChannelData implements ChannelMessage {
public static String bToS(byte[] data) {
StringBuilder buf = new StringBuilder(4*16);
buf.append('{');
- for (int i=0; data!=null && i<data.length; i++ ) buf.append(String.valueOf(data[i])).append(' ');
+ for (int i=0; data!=null && i<data.length; i++ ) {
+ buf.append(String.valueOf(data[i])).append(' ');
+ }
buf.append('}');
return buf.toString();
}
diff --git a/java/org/apache/catalina/tribes/io/ObjectReader.java b/java/org/apache/catalina/tribes/io/ObjectReader.java
index b47e746..20eed9e 100644
--- a/java/org/apache/catalina/tribes/io/ObjectReader.java
+++ b/java/org/apache/catalina/tribes/io/ObjectReader.java
@@ -97,14 +97,18 @@ public class ObjectReader {
public int append(ByteBuffer data, int len, boolean count) {
buffer.append(data,len);
int pkgCnt = -1;
- if ( count ) pkgCnt = buffer.countPackages();
+ if ( count ) {
+ pkgCnt = buffer.countPackages();
+ }
return pkgCnt;
}
public int append(byte[] data,int off,int len, boolean count) {
buffer.append(data,off,len);
int pkgCnt = -1;
- if ( count ) pkgCnt = buffer.countPackages();
+ if ( count ) {
+ pkgCnt = buffer.countPackages();
+ }
return pkgCnt;
}
diff --git a/java/org/apache/catalina/tribes/io/ReplicationStream.java b/java/org/apache/catalina/tribes/io/ReplicationStream.java
index cd403b3..8ad3a43 100644
--- a/java/org/apache/catalina/tribes/io/ReplicationStream.java
+++ b/java/org/apache/catalina/tribes/io/ReplicationStream.java
@@ -84,15 +84,17 @@ public final class ReplicationStream extends ObjectInputStream {
boolean tryRepFirst = name.startsWith("org.apache.catalina.tribes");
try {
- if (tryRepFirst)
+ if (tryRepFirst) {
return findReplicationClass(name);
- else
+ } else {
return findExternalClass(name);
+ }
} catch (Exception x) {
- if (tryRepFirst)
+ if (tryRepFirst) {
return findExternalClass(name);
- else
+ } else {
return findReplicationClass(name);
+ }
}
}
@@ -117,7 +119,9 @@ public final class ReplicationStream extends ObjectInputStream {
Class<?>[] classObjs = new Class[interfaces.length];
for (int i = 0; i < interfaces.length; i++) {
Class<?> cl = this.resolveClass(interfaces[i]);
- if (latestLoader==null) latestLoader = cl.getClassLoader();
+ if (latestLoader==null) {
+ latestLoader = cl.getClassLoader();
+ }
if ((cl.getModifiers() & Modifier.PUBLIC) == 0) {
if (hasNonPublicInterface) {
if (nonPublicLoader != cl.getClassLoader()) {
@@ -156,8 +160,11 @@ public final class ReplicationStream extends ObjectInputStream {
cnfe = x;
}
}
- if ( cnfe != null ) throw cnfe;
- else throw new ClassNotFoundException(name);
+ if ( cnfe != null ) {
+ throw cnfe;
+ } else {
+ throw new ClassNotFoundException(name);
+ }
}
@Override
diff --git a/java/org/apache/catalina/tribes/io/XByteBuffer.java b/java/org/apache/catalina/tribes/io/XByteBuffer.java
index c915552..6962271 100644
--- a/java/org/apache/catalina/tribes/io/XByteBuffer.java
+++ b/java/org/apache/catalina/tribes/io/XByteBuffer.java
@@ -111,14 +111,17 @@ public class XByteBuffer implements Serializable {
}
public void setLength(int size) {
- if ( size > buf.length ) throw new ArrayIndexOutOfBoundsException(sm.getString("xByteBuffer.size.larger.buffer"));
+ if ( size > buf.length ) {
+ throw new ArrayIndexOutOfBoundsException(sm.getString("xByteBuffer.size.larger.buffer"));
+ }
bufSize = size;
}
public void trim(int length) {
- if ( (bufSize - length) < 0 )
+ if ( (bufSize - length) < 0 ) {
throw new ArrayIndexOutOfBoundsException(sm.getString("xByteBuffer.unableTrim",
Integer.toString(bufSize), Integer.toString(length)));
+ }
bufSize -= length;
}
@@ -271,25 +274,33 @@ public class XByteBuffer implements Serializable {
int index = XByteBuffer.firstIndexOf(buf,start,START_DATA);
//if the header (START_DATA) isn't the first thing or
//the buffer isn't even 14 bytes
- if ( index != start || ((bufSize-start)<14) ) break;
+ if ( index != start || ((bufSize-start)<14) ) {
+ break;
+ }
//next 4 bytes are compress flag not needed for count packages
//then get the size 4 bytes
int size = toInt(buf, pos);
//now the total buffer has to be long enough to hold
//START_DATA.length+4+size+END_DATA.length
pos = start + START_DATA.length + 4 + size;
- if ( (pos + END_DATA.length) > bufSize) break;
+ if ( (pos + END_DATA.length) > bufSize) {
+ break;
+ }
//and finally check the footer of the package END_DATA
int newpos = firstIndexOf(buf, pos, END_DATA);
//mismatch, there is no package
- if (newpos != pos) break;
+ if (newpos != pos) {
+ break;
+ }
//increase the packet count
cnt++;
//reset the values
start = pos + END_DATA.length;
pos = start + START_DATA.length;
//we only want to verify that we have at least one package
- if ( first ) break;
+ if ( first ) {
+ break;
+ }
}
return cnt;
}
@@ -497,9 +508,15 @@ public class XByteBuffer implements Serializable {
*/
public static int firstIndexOf(byte[] src, int srcOff, byte[] find){
int result = -1;
- if (find.length > src.length) return result;
- if (find.length == 0 || src.length == 0) return result;
- if (srcOff >= src.length ) throw new java.lang.ArrayIndexOutOfBoundsException();
+ if (find.length > src.length) {
+ return result;
+ }
+ if (find.length == 0 || src.length == 0) {
+ return result;
+ }
+ if (srcOff >= src.length ) {
+ throw new java.lang.ArrayIndexOutOfBoundsException();
+ }
boolean found = false;
int srclen = src.length;
int findlen = find.length;
@@ -508,17 +525,20 @@ public class XByteBuffer implements Serializable {
while (!found) {
//find the first byte
while (pos < srclen){
- if (first == src[pos])
+ if (first == src[pos]) {
break;
+ }
pos++;
}
- if (pos >= srclen)
+ if (pos >= srclen) {
return -1;
+ }
//we found the first character
//match the rest of the bytes - they have to match
- if ( (srclen - pos) < findlen)
+ if ( (srclen - pos) < findlen) {
return -1;
+ }
//assume it does exist
found = true;
for (int i = 1; ( (i < findlen) && found); i++) {
@@ -552,7 +572,9 @@ public class XByteBuffer implements Serializable {
throws IOException, ClassNotFoundException, ClassCastException {
invokecount.addAndGet(1);
Object message = null;
- if ( cls == null ) cls = new ClassLoader[0];
+ if ( cls == null ) {
+ cls = new ClassLoader[0];
+ }
if (data != null && length > 0) {
InputStream instream = new ByteArrayInputStream(data,offset,length);
ObjectInputStream stream = null;
@@ -563,9 +585,9 @@ public class XByteBuffer implements Serializable {
}
if ( message == null ) {
return null;
- } else if (message instanceof Serializable)
+ } else if (message instanceof Serializable) {
return (Serializable) message;
- else {
+ } else {
throw new ClassCastException(sm.getString("xByteBuffer.wrong.class", message.getClass().getName()));
}
}
diff --git a/java/org/apache/catalina/tribes/jmx/JmxRegistry.java b/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
index b4d4565..03ac42a 100644
--- a/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
+++ b/java/org/apache/catalina/tribes/jmx/JmxRegistry.java
@@ -49,14 +49,22 @@ public class JmxRegistry {
return null;
}
JmxRegistry registry = registryCache.get(channel.getName());
- if (registry != null) return registry;
+ if (registry != null) {
+ return registry;
+ }
- if (!(channel instanceof JmxChannel)) return null;
+ if (!(channel instanceof JmxChannel)) {
+ return null;
+ }
JmxChannel jmxChannel = (JmxChannel) channel;
- if (!jmxChannel.isJmxEnabled()) return null;
+ if (!jmxChannel.isJmxEnabled()) {
+ return null;
+ }
ObjectName baseOn = createBaseObjectName(jmxChannel.getJmxDomain(),
jmxChannel.getJmxPrefix(), channel.getName());
- if (baseOn == null) return null;
+ if (baseOn == null) {
+ return null;
+ }
// create registry
registry = new JmxRegistry();
registry.baseOname = baseOn;
@@ -69,7 +77,9 @@ public class JmxRegistry {
public static void removeRegistry(Channel channel, boolean clear) {
JmxRegistry registry = registryCache.get(channel.getName());
- if (registry == null) return;
+ if (registry == null) {
+ return;
+ }
if (clear) {
registry.clearMBeans();
}
@@ -118,7 +128,9 @@ public class JmxRegistry {
}
public void unregisterJmx(ObjectName oname) {
- if (oname ==null) return;
+ if (oname ==null) {
+ return;
+ }
try {
mbserver.unregisterMBean(oname);
} catch (InstanceNotFoundException e) {
diff --git a/java/org/apache/catalina/tribes/membership/McastService.java b/java/org/apache/catalina/tribes/membership/McastService.java
index a430405..07e9e3a 100644
--- a/java/org/apache/catalina/tribes/membership/McastService.java
+++ b/java/org/apache/catalina/tribes/membership/McastService.java
@@ -143,7 +143,9 @@ public class McastService
*/
@Override
public Member getLocalMember(boolean alive) {
- if ( alive && localMember != null && impl != null) localMember.setMemberAliveTime(System.currentTimeMillis()-impl.getServiceStartTime());
+ if ( alive && localMember != null && impl != null) {
+ localMember.setMemberAliveTime(System.currentTimeMillis()-impl.getServiceStartTime());
+ }
return localMember;
}
@@ -288,7 +290,9 @@ public class McastService
* @param name The property to check for
*/
protected void hasProperty(Properties properties, String name){
- if ( properties.getProperty(name)==null) throw new IllegalArgumentException(sm.getString("mcastService.missing.property", name));
+ if ( properties.getProperty(name)==null) {
+ throw new IllegalArgumentException(sm.getString("mcastService.missing.property", name));
+ }
}
/**
@@ -333,8 +337,12 @@ public class McastService
}
localMember.setSecurePort(securePort);
localMember.setUdpPort(udpPort);
- if ( this.payload != null ) localMember.setPayload(payload);
- if ( this.domain != null ) localMember.setDomain(domain);
+ if ( this.payload != null ) {
+ localMember.setPayload(payload);
+ }
+ if ( this.domain != null ) {
+ localMember.setDomain(domain);
+ }
localMember.setServiceStartTime(System.currentTimeMillis());
java.net.InetAddress bind = null;
if ( properties.getProperty("mcastBindAddress")!= null ) {
@@ -511,7 +519,9 @@ public class McastService
@Override
public void messageReceived(ChannelMessage msg) {
- if (msglistener!=null && msglistener.accept(msg)) msglistener.messageReceived(msg);
+ if (msglistener!=null && msglistener.accept(msg)) {
+ msglistener.messageReceived(msg);
+ }
}
@Override
@@ -520,8 +530,9 @@ public class McastService
}
@Override
public void broadcast(ChannelMessage message) throws ChannelException {
- if (impl==null || (impl.startLevel & Channel.MBR_TX_SEQ)!=Channel.MBR_TX_SEQ )
+ if (impl==null || (impl.startLevel & Channel.MBR_TX_SEQ)!=Channel.MBR_TX_SEQ ) {
throw new ChannelException(sm.getString("mcastService.noStart"));
+ }
byte[] data = XByteBuffer.createDataPackage((ChannelData)message);
if (data.length>McastServiceImpl.MAX_PACKET_SIZE) {
@@ -572,7 +583,9 @@ public class McastService
if ( localMember != null ) {
localMember.setPayload(payload);
try {
- if (impl != null) impl.send(false);
+ if (impl != null) {
+ impl.send(false);
+ }
}catch ( Exception x ) {
log.error(sm.getString("McastService.payload"), x);
}
@@ -585,7 +598,9 @@ public class McastService
if ( localMember != null ) {
localMember.setDomain(domain);
try {
- if (impl != null) impl.send(false);
+ if (impl != null) {
+ impl.send(false);
+ }
}catch ( Exception x ) {
log.error(sm.getString("McastService.domain"), x);
}
@@ -593,9 +608,14 @@ public class McastService
}
public void setDomain(String domain) {
- if ( domain == null ) return;
- if ( domain.startsWith("{") ) setDomain(Arrays.fromString(domain));
- else setDomain(Arrays.convert(domain));
+ if ( domain == null ) {
+ return;
+ }
+ if ( domain.startsWith("{") ) {
+ setDomain(Arrays.fromString(domain));
+ } else {
+ setDomain(Arrays.convert(domain));
+ }
}
@Override
@@ -610,22 +630,30 @@ public class McastService
protected void setDefaults(Properties properties) {
// default values
- if (properties.getProperty("mcastPort") == null)
+ if (properties.getProperty("mcastPort") == null) {
properties.setProperty("mcastPort","45564");
- if (properties.getProperty("mcastAddress") == null)
+ }
+ if (properties.getProperty("mcastAddress") == null) {
properties.setProperty("mcastAddress","228.0.0.4");
- if (properties.getProperty("memberDropTime") == null)
+ }
+ if (properties.getProperty("memberDropTime") == null) {
properties.setProperty("memberDropTime","3000");
- if (properties.getProperty("mcastFrequency") == null)
+ }
+ if (properties.getProperty("mcastFrequency") == null) {
properties.setProperty("mcastFrequency","500");
- if (properties.getProperty("recoveryCounter") == null)
+ }
+ if (properties.getProperty("recoveryCounter") == null) {
properties.setProperty("recoveryCounter", "10");
- if (properties.getProperty("recoveryEnabled") == null)
+ }
+ if (properties.getProperty("recoveryEnabled") == null) {
properties.setProperty("recoveryEnabled", "true");
- if (properties.getProperty("recoverySleepTime") == null)
+ }
+ if (properties.getProperty("recoverySleepTime") == null) {
properties.setProperty("recoverySleepTime", "5000");
- if (properties.getProperty("localLoopbackDisabled") == null)
+ }
+ if (properties.getProperty("localLoopbackDisabled") == null) {
properties.setProperty("localLoopbackDisabled", "false");
+ }
}
/**
diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
index 4680ea9..9ee2370 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -208,7 +208,9 @@ public class McastServiceImpl {
receivePacket.setAddress(address);
receivePacket.setPort(port);
member.setCommand(new byte[0]);
- if ( membership == null ) membership = new Membership(member);
+ if ( membership == null ) {
+ membership = new Membership(member);
+ }
}
protected void setupSocket() throws IOException {
@@ -230,12 +232,15 @@ public class McastServiceImpl {
}
socket.setLoopbackMode(localLoopbackDisabled); //hint if we want disable loop back(local machine) messages
if (mcastBindAddress != null) {
- if(log.isInfoEnabled())
+ if(log.isInfoEnabled()) {
log.info(sm.getString("mcastServiceImpl.setInterface", mcastBindAddress));
+ }
socket.setInterface(mcastBindAddress);
} //end if
//force a so timeout so that we don't block forever
- if (mcastSoTimeout <= 0) mcastSoTimeout = (int)sendFrequency;
+ if (mcastSoTimeout <= 0) {
+ mcastSoTimeout = (int)sendFrequency;
+ }
if (log.isInfoEnabled()) {
log.info(sm.getString("mcastServiceImpl.setSoTimeout",
Integer.toString(mcastSoTimeout)));
@@ -243,8 +248,9 @@ public class McastServiceImpl {
socket.setSoTimeout(mcastSoTimeout);
if ( mcastTTL >= 0 ) {
- if(log.isInfoEnabled())
+ if(log.isInfoEnabled()) {
log.info(sm.getString("mcastServiceImpl.setTTL", Integer.toString(mcastTTL)));
+ }
socket.setTimeToLive(mcastTTL);
}
}
@@ -259,9 +265,13 @@ public class McastServiceImpl {
public synchronized void start(int level) throws IOException {
boolean valid = false;
if ( (level & Channel.MBR_RX_SEQ)==Channel.MBR_RX_SEQ ) {
- if ( receiver != null ) throw new IllegalStateException(sm.getString("mcastServiceImpl.receive.running"));
+ if ( receiver != null ) {
+ throw new IllegalStateException(sm.getString("mcastServiceImpl.receive.running"));
+ }
try {
- if ( sender == null ) socket.joinGroup(address);
+ if ( sender == null ) {
+ socket.joinGroup(address);
+ }
}catch (IOException iox) {
log.error(sm.getString("mcastServiceImpl.unable.join"));
throw iox;
@@ -273,8 +283,12 @@ public class McastServiceImpl {
valid = true;
}
if ( (level & Channel.MBR_TX_SEQ)==Channel.MBR_TX_SEQ ) {
- if ( sender != null ) throw new IllegalStateException(sm.getString("mcastServiceImpl.send.running"));
- if ( receiver == null ) socket.joinGroup(address);
+ if ( sender != null ) {
+ throw new IllegalStateException(sm.getString("mcastServiceImpl.send.running"));
+ }
+ if ( receiver == null ) {
+ socket.joinGroup(address);
+ }
//make sure at least one packet gets out there
send(false);
doRunSender = true;
@@ -294,12 +308,14 @@ public class McastServiceImpl {
private void waitForMembers(int level) {
long memberwait = sendFrequency*2;
- if(log.isInfoEnabled())
+ if(log.isInfoEnabled()) {
log.info(sm.getString("mcastServiceImpl.waitForMembers.start",
Long.toString(memberwait), Integer.toString(level)));
+ }
try {Thread.sleep(memberwait);}catch (InterruptedException ignore){}
- if(log.isInfoEnabled())
+ if(log.isInfoEnabled()) {
log.info(sm.getString("mcastServiceImpl.waitForMembers.done", Integer.toString(level)));
+ }
}
/**
@@ -314,13 +330,17 @@ public class McastServiceImpl {
if ( (level & Channel.MBR_RX_SEQ)==Channel.MBR_RX_SEQ ) {
valid = true;
doRunReceiver = false;
- if ( receiver !=null ) receiver.interrupt();
+ if ( receiver !=null ) {
+ receiver.interrupt();
+ }
receiver = null;
}
if ( (level & Channel.MBR_TX_SEQ)==Channel.MBR_TX_SEQ ) {
valid = true;
doRunSender = false;
- if ( sender != null )sender.interrupt();
+ if ( sender != null ) {
+ sender.interrupt();
+ }
sender = null;
}
@@ -368,15 +388,21 @@ public class McastServiceImpl {
//since the receive thread is the same thread
//that does membership expiration
}
- if (checkexpired) checkExpired();
+ if (checkexpired) {
+ checkExpired();
+ }
}
private void memberDataReceived(byte[] data) {
final Member m = MemberImpl.getMember(data);
- if (log.isTraceEnabled()) log.trace("Mcast receive ping from member " + m);
+ if (log.isTraceEnabled()) {
+ log.trace("Mcast receive ping from member " + m);
+ }
Runnable t = null;
if (Arrays.equals(m.getCommand(), Member.SHUTDOWN_PAYLOAD)) {
- if (log.isDebugEnabled()) log.debug("Member has shutdown:" + m);
+ if (log.isDebugEnabled()) {
+ log.debug("Member has shutdown:" + m);
+ }
membership.removeMember(m);
t = new Runnable() {
@Override
@@ -391,7 +417,9 @@ public class McastServiceImpl {
}
};
} else if (membership.memberAlive(m)) {
- if (log.isDebugEnabled()) log.debug("Mcast add member " + m);
+ if (log.isDebugEnabled()) {
+ log.debug("Mcast add member " + m);
+ }
t = new Runnable() {
@Override
public void run() {
@@ -411,7 +439,9 @@ public class McastServiceImpl {
}
private void memberBroadcastsReceived(final byte[] b) {
- if (log.isTraceEnabled()) log.trace("Mcast received broadcasts.");
+ if (log.isTraceEnabled()) {
+ log.trace("Mcast received broadcasts.");
+ }
XByteBuffer buffer = new XByteBuffer(b,true);
if (buffer.countPackages(true)>0) {
int count = buffer.countPackages();
@@ -458,8 +488,9 @@ public class McastServiceImpl {
synchronized (expiredMutex) {
Member[] expired = membership.expire(timeToExpiration);
for (final Member member : expired) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Mcast expire member " + member);
+ }
try {
Runnable t = new Runnable() {
@Override
@@ -513,7 +544,9 @@ public class McastServiceImpl {
synchronized (sendLock) {
socket.send(packet);
}
- if ( checkexpired ) checkExpired();
+ if ( checkexpired ) {
+ checkExpired();
+ }
}
public long getServiceStartTime() {
@@ -545,7 +578,9 @@ public class McastServiceImpl {
public ReceiverThread() {
super();
String channelName = "";
- if (channel.getName() != null) channelName = "[" + channel.getName() + "]";
+ if (channel.getName() != null) {
+ channelName = "[" + channel.getName() + "]";
+ }
setName("Tribes-MembershipReceiver" + channelName);
}
@Override
@@ -557,11 +592,15 @@ public class McastServiceImpl {
} catch ( ArrayIndexOutOfBoundsException ax ) {
//we can ignore this, as it means we have an invalid package
//but we will log it to debug
- if ( log.isDebugEnabled() )
+ if ( log.isDebugEnabled() ) {
log.debug("Invalid member mcast package.",ax);
+ }
} catch ( Exception x ) {
- if (errorCounter==0 && doRunReceiver) log.warn(sm.getString("mcastServiceImpl.error.receiving"),x);
- else if (log.isDebugEnabled()) log.debug("Error receiving mcast package"+(doRunReceiver?". Sleeping 500ms":"."),x);
+ if (errorCounter==0 && doRunReceiver) {
+ log.warn(sm.getString("mcastServiceImpl.error.receiving"),x);
+ } else if (log.isDebugEnabled()) {
+ log.debug("Error receiving mcast package"+(doRunReceiver?". Sleeping 500ms":"."),x);
+ }
if (doRunReceiver) {
try { Thread.sleep(500); } catch ( Exception ignore ){}
if ( (++errorCounter)>=recoveryCounter ) {
@@ -580,7 +619,9 @@ public class McastServiceImpl {
public SenderThread(long time) {
this.time = time;
String channelName = "";
- if (channel.getName() != null) channelName = "[" + channel.getName() + "]";
+ if (channel.getName() != null) {
+ channelName = "[" + channel.getName() + "]";
+ }
setName("Tribes-MembershipSender" + channelName);
}
@@ -591,8 +632,11 @@ public class McastServiceImpl {
send(true);
errorCounter = 0;
} catch ( Exception x ) {
- if (errorCounter==0) log.warn(sm.getString("mcastServiceImpl.send.failed"),x);
- else log.debug("Unable to send mcast message.",x);
+ if (errorCounter==0) {
+ log.warn(sm.getString("mcastServiceImpl.send.failed"),x);
+ } else {
+ log.debug("Unable to send mcast message.",x);
+ }
if ( (++errorCounter)>=recoveryCounter ) {
errorCounter=0;
RecoveryThread.recover(McastServiceImpl.this);
@@ -619,7 +663,9 @@ public class McastServiceImpl {
Thread t = new RecoveryThread(parent);
String channelName = "";
- if (parent.channel.getName() != null) channelName = "[" + parent.channel.getName() + "]";
+ if (parent.channel.getName() != null) {
+ channelName = "[" + parent.channel.getName() + "]";
+ }
t.setName("Tribes-MembershipRecovery" + channelName);
t.setDaemon(true);
t.start();
@@ -656,19 +702,22 @@ public class McastServiceImpl {
int attempt = 0;
try {
while (!success) {
- if(log.isInfoEnabled())
+ if(log.isInfoEnabled()) {
log.info(sm.getString("mcastServiceImpl.recovery"));
+ }
if (stopService() & startService()) {
success = true;
- if(log.isInfoEnabled())
+ if(log.isInfoEnabled()) {
log.info(sm.getString("mcastServiceImpl.recovery.successful"));
+ }
}
try {
if (!success) {
- if(log.isInfoEnabled())
+ if(log.isInfoEnabled()) {
log.info(sm.getString("mcastServiceImpl.recovery.failed",
Integer.toString(++attempt),
Long.toString(parent.recoverySleepTime)));
+ }
Thread.sleep(parent.recoverySleepTime);
}
}catch (InterruptedException ignore) {
diff --git a/java/org/apache/catalina/tribes/membership/MemberImpl.java b/java/org/apache/catalina/tribes/membership/MemberImpl.java
index 61648cc..5734c3d 100644
--- a/java/org/apache/catalina/tribes/membership/MemberImpl.java
+++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java
@@ -584,9 +584,9 @@ public class MemberImpl implements Member, java.io.Externalizable {
return Arrays.equals(this.getHost(),((MemberImpl)o).getHost()) &&
this.getPort() == ((MemberImpl)o).getPort() &&
Arrays.equals(this.getUniqueId(),((MemberImpl)o).getUniqueId());
- }
- else
+ } else {
return false;
+ }
}
public synchronized void setHost(byte[] host) {
diff --git a/java/org/apache/catalina/tribes/membership/Membership.java b/java/org/apache/catalina/tribes/membership/Membership.java
index a6478c2..34e0a21 100644
--- a/java/org/apache/catalina/tribes/membership/Membership.java
+++ b/java/org/apache/catalina/tribes/membership/Membership.java
@@ -199,7 +199,9 @@ public class Membership implements Cloneable {
break;
}
}
- if (n < 0) return;
+ if (n < 0) {
+ return;
+ }
Member results[] = new Member[members.length - 1];
int j = 0;
for (int i = 0; i < members.length; i++) {
diff --git a/java/org/apache/catalina/tribes/membership/StaticMember.java b/java/org/apache/catalina/tribes/membership/StaticMember.java
index a4245dc..39159f9 100644
--- a/java/org/apache/catalina/tribes/membership/StaticMember.java
+++ b/java/org/apache/catalina/tribes/membership/StaticMember.java
@@ -38,9 +38,14 @@ public class StaticMember extends MemberImpl {
* or as a regular hostname, 127.0.0.1 or tomcat01.mydomain.com
*/
public void setHost(String host) {
- if ( host == null ) return;
- if ( host.startsWith("{") ) setHost(Arrays.fromString(host));
- else try { setHostname(host); }catch (IOException x) { throw new RuntimeException(x);}
+ if ( host == null ) {
+ return;
+ }
+ if ( host.startsWith("{") ) {
+ setHost(Arrays.fromString(host));
+ } else {
+ try { setHostname(host); }catch (IOException x) { throw new RuntimeException(x);}
+ }
}
@@ -49,9 +54,14 @@ public class StaticMember extends MemberImpl {
* or as a regular string value like 'mydomain'. The latter will be converted using ISO-8859-1 encoding
*/
public void setDomain(String domain) {
- if ( domain == null ) return;
- if ( domain.startsWith("{") ) setDomain(Arrays.fromString(domain));
- else setDomain(Arrays.convert(domain));
+ if ( domain == null ) {
+ return;
+ }
+ if ( domain.startsWith("{") ) {
+ setDomain(Arrays.fromString(domain));
+ } else {
+ setDomain(Arrays.convert(domain));
+ }
}
/**
@@ -59,7 +69,9 @@ public class StaticMember extends MemberImpl {
*/
public void setUniqueId(String id) {
byte[] uuid = Arrays.fromString(id);
- if ( uuid==null || uuid.length != 16 ) throw new RuntimeException(sm.getString("staticMember.invalid.uuidLength", id));
+ if ( uuid==null || uuid.length != 16 ) {
+ throw new RuntimeException(sm.getString("staticMember.invalid.uuidLength", id));
+ }
setUniqueId(uuid);
}
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 6e87d6a..c12659b 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -195,8 +195,11 @@ public abstract class AbstractReplicatedMap<K,V>
* @return Member[]
*/
protected Member[] wrap(Member m) {
- if ( m == null ) return new Member[0];
- else return new Member[] {m};
+ if ( m == null ) {
+ return new Member[0];
+ } else {
+ return new Member[] {m};
+ }
}
/**
@@ -213,7 +216,9 @@ public abstract class AbstractReplicatedMap<K,V>
protected void init(MapOwner owner, Channel channel, String mapContextName,
long timeout, int channelSendOptions,ClassLoader[] cls, boolean terminate) {
long start = System.currentTimeMillis();
- if (log.isInfoEnabled()) log.info(sm.getString("abstractReplicatedMap.init.start", mapContextName));
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("abstractReplicatedMap.init.start", mapContextName));
+ }
this.mapOwner = owner;
this.externalLoaders = cls;
this.channelSendOptions = channelSendOptions;
@@ -223,7 +228,9 @@ public abstract class AbstractReplicatedMap<K,V>
this.mapname = mapContextName;
//unique context is more efficient if it is stored as bytes
this.mapContextName = mapContextName.getBytes(StandardCharsets.ISO_8859_1);
- if ( log.isTraceEnabled() ) log.trace("Created Lazy Map with name:"+mapContextName+", bytes:"+Arrays.toString(this.mapContextName));
+ if ( log.isTraceEnabled() ) {
+ log.trace("Created Lazy Map with name:"+mapContextName+", bytes:"+Arrays.toString(this.mapContextName));
+ }
//create an rpc channel and add the map as a listener
this.rpcChannel = new RpcChannel(this.mapContextName, channel, this);
@@ -248,9 +255,10 @@ public abstract class AbstractReplicatedMap<K,V>
}
this.state = State.INITIALIZED;
long complete = System.currentTimeMillis() - start;
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info(sm.getString("abstractReplicatedMap.init.completed",
mapContextName, Long.toString(complete)));
+ }
}
@@ -286,17 +294,19 @@ public abstract class AbstractReplicatedMap<K,V>
memberAlive(member);
} else if (state == State.STATETRANSFERRED) {
synchronized (mapMembers) {
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info(sm.getString("abstractReplicatedMap.ping.stateTransferredMember",
member));
+ }
if (mapMembers.containsKey(member)) {
mapMembers.put(member, Long.valueOf(System.currentTimeMillis()));
}
}
} else {
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info(sm.getString("abstractReplicatedMap.mapMember.unavailable",
member));
+ }
}
} catch (ClassNotFoundException | IOException e) {
log.error(sm.getString("abstractReplicatedMap.unable.deserialize.MapMessage"), e);
@@ -345,7 +355,9 @@ public abstract class AbstractReplicatedMap<K,V>
protected void broadcast(int msgtype, boolean rpc) throws ChannelException {
Member[] members = channel.getMembers();
// No destination.
- if (members.length == 0 ) return;
+ if (members.length == 0 ) {
+ return;
+ }
//send out a map membership message, only wait for the first reply
MapMessage msg = new MapMessage(this.mapContextName, msgtype,
false, null, null, null, channel.getLocalMember(false), null);
@@ -400,8 +412,12 @@ public abstract class AbstractReplicatedMap<K,V>
@Override
public boolean equals(Object o) {
- if ( !(o instanceof AbstractReplicatedMap)) return false;
- if ( !(o.getClass().equals(this.getClass())) ) return false;
+ if ( !(o instanceof AbstractReplicatedMap)) {
+ return false;
+ }
+ if ( !(o.getClass().equals(this.getClass())) ) {
+ return false;
+ }
@SuppressWarnings("unchecked")
AbstractReplicatedMap<K,V> other = (AbstractReplicatedMap<K,V>)o;
return Arrays.equals(mapContextName,other.mapContextName);
@@ -428,7 +444,9 @@ public abstract class AbstractReplicatedMap<K,V>
synchronized (mapMembers) {
@SuppressWarnings("unchecked") // mapMembers has the correct type
HashMap<Member, Long> list = (HashMap<Member, Long>)mapMembers.clone();
- for (Member member : exclude) list.remove(member);
+ for (Member member : exclude) {
+ list.remove(member);
+ }
return getMapMembers(list);
}
}
@@ -443,22 +461,30 @@ public abstract class AbstractReplicatedMap<K,V>
* be replicated
*/
public void replicate(Object key, boolean complete) {
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("Replicate invoked on key:"+key);
+ }
MapEntry<K,V> entry = innerMap.get(key);
- if ( entry == null ) return;
- if ( !entry.isSerializable() ) return;
+ if ( entry == null ) {
+ return;
+ }
+ if ( !entry.isSerializable() ) {
+ return;
+ }
if (entry.isPrimary() && entry.getBackupNodes()!= null && entry.getBackupNodes().length > 0) {
//check to see if we need to replicate this object isDirty()||complete || isAccessReplicate()
ReplicatedMapEntry rentry = null;
- if (entry.getValue() instanceof ReplicatedMapEntry) rentry = (ReplicatedMapEntry)entry.getValue();
+ if (entry.getValue() instanceof ReplicatedMapEntry) {
+ rentry = (ReplicatedMapEntry)entry.getValue();
+ }
boolean isDirty = rentry != null && rentry.isDirty();
boolean isAccess = rentry != null && rentry.isAccessReplicate();
boolean repl = complete || isDirty || isAccess;
if (!repl) {
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("Not replicating:"+key+", no change made");
+ }
return;
}
@@ -495,7 +521,9 @@ public abstract class AbstractReplicatedMap<K,V>
}
try {
if ( channel!=null && entry.getBackupNodes()!= null && entry.getBackupNodes().length > 0 ) {
- if (rentry != null) rentry.setLastTimeReplicated(System.currentTimeMillis());
+ if (rentry != null) {
+ rentry.setLastTimeReplicated(System.currentTimeMillis());
+ }
channel.send(entry.getBackupNodes(), msg, channelSendOptions);
}
} catch (ChannelException x) {
@@ -551,7 +579,9 @@ public abstract class AbstractReplicatedMap<K,V>
*/
@Override
public Serializable replyRequest(Serializable msg, final Member sender) {
- if (! (msg instanceof MapMessage))return null;
+ if (! (msg instanceof MapMessage)) {
+ return null;
+ }
MapMessage mapmsg = (MapMessage) msg;
//map init request
@@ -570,7 +600,9 @@ public abstract class AbstractReplicatedMap<K,V>
//backup request
if (mapmsg.getMsgType() == MapMessage.MSG_RETRIEVE_BACKUP) {
MapEntry<K,V> entry = innerMap.get(mapmsg.getKey());
- if (entry == null || (!entry.isSerializable()) )return null;
+ if (entry == null || (!entry.isSerializable()) ) {
+ return null;
+ }
mapmsg.setValue( (Serializable) entry.getValue());
return mapmsg;
}
@@ -615,7 +647,9 @@ public abstract class AbstractReplicatedMap<K,V>
@Override
public void leftOver(Serializable msg, Member sender) {
//left over membership messages
- if (! (msg instanceof MapMessage))return;
+ if (! (msg instanceof MapMessage)) {
+ return;
+ }
MapMessage mapmsg = (MapMessage) msg;
try {
@@ -626,17 +660,19 @@ public abstract class AbstractReplicatedMap<K,V>
memberAlive(mapmsg.getPrimary());
} else if (mapmsg.getMsgType() == MapMessage.MSG_PING) {
Member member = mapmsg.getPrimary();
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info(sm.getString("abstractReplicatedMap.leftOver.pingMsg", member));
+ }
State state = (State) mapmsg.getValue();
if (state.isAvailable()) {
memberAlive(member);
}
} else {
// other messages are ignored.
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info(sm.getString("abstractReplicatedMap.leftOver.ignored",
mapmsg.getTypeDesc()));
+ }
}
} catch (IOException | ClassNotFoundException x) {
log.error(sm.getString("abstractReplicatedMap.unable.deserialize.MapMessage"),x);
@@ -646,7 +682,9 @@ public abstract class AbstractReplicatedMap<K,V>
@SuppressWarnings("unchecked")
@Override
public void messageReceived(Serializable msg, Member sender) {
- if (! (msg instanceof MapMessage)) return;
+ if (! (msg instanceof MapMessage)) {
+ return;
+ }
MapMessage mapmsg = (MapMessage) msg;
if ( log.isTraceEnabled() ) {
@@ -659,8 +697,9 @@ public abstract class AbstractReplicatedMap<K,V>
log.error(sm.getString("abstractReplicatedMap.unable.deserialize.MapMessage"), x);
return;
}
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("Map message received from:"+sender.getName()+" msg:"+mapmsg);
+ }
if (mapmsg.getMsgType() == MapMessage.MSG_START) {
mapMemberAdded(mapmsg.getPrimary());
}
@@ -736,7 +775,9 @@ public abstract class AbstractReplicatedMap<K,V>
re.setOwner(getMapOwner());
entry.setValue((V) re);
} else {
- if ( mapmsg.getValue()!=null ) entry.setValue((V) mapmsg.getValue());
+ if ( mapmsg.getValue()!=null ) {
+ entry.setValue((V) mapmsg.getValue());
+ }
} //end if
} //end if
innerMap.put(entry.getKey(), entry);
@@ -769,15 +810,21 @@ public abstract class AbstractReplicatedMap<K,V>
public boolean accept(Serializable msg, Member sender) {
boolean result = false;
if (msg instanceof MapMessage) {
- if ( log.isTraceEnabled() ) log.trace("Map["+mapname+"] accepting...."+msg);
+ if ( log.isTraceEnabled() ) {
+ log.trace("Map["+mapname+"] accepting...."+msg);
+ }
result = Arrays.equals(mapContextName, ( (MapMessage) msg).getMapId());
- if ( log.isTraceEnabled() ) log.trace("Msg["+mapname+"] accepted["+result+"]...."+msg);
+ if ( log.isTraceEnabled() ) {
+ log.trace("Msg["+mapname+"] accepted["+result+"]...."+msg);
+ }
}
return result;
}
public void mapMemberAdded(Member member) {
- if ( member.equals(getChannel().getLocalMember(false)) ) return;
+ if ( member.equals(getChannel().getLocalMember(false)) ) {
+ return;
+ }
boolean memberAdded = false;
//select a backup node if we don't have one
Member mapMember = getChannel().getMember(member);
@@ -787,8 +834,9 @@ public abstract class AbstractReplicatedMap<K,V>
}
synchronized (mapMembers) {
if (!mapMembers.containsKey(mapMember) ) {
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info(sm.getString("abstractReplicatedMap.mapMemberAdded.added", mapMember));
+ }
mapMembers.put(mapMember, Long.valueOf(System.currentTimeMillis()));
memberAdded = true;
}
@@ -797,7 +845,9 @@ public abstract class AbstractReplicatedMap<K,V>
synchronized (stateMutex) {
for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
- if ( entry == null ) continue;
+ if ( entry == null ) {
+ continue;
+ }
if (entry.isPrimary() && (entry.getBackupNodes() == null || entry.getBackupNodes().length == 0)) {
try {
Member[] backup = publishEntryInfo(entry.getKey(), entry.getValue());
@@ -813,13 +863,16 @@ public abstract class AbstractReplicatedMap<K,V>
}
public boolean inSet(Member m, Member[] set) {
- if ( set == null ) return false;
+ if ( set == null ) {
+ return false;
+ }
boolean result = false;
- for (Member member : set)
+ for (Member member : set) {
if (m.equals(member)) {
result = true;
break;
}
+ }
return result;
}
@@ -827,12 +880,15 @@ public abstract class AbstractReplicatedMap<K,V>
List<Member> result = new ArrayList<>();
for (Member member : set) {
boolean include = true;
- for (Member mbr : mbrs)
+ for (Member mbr : mbrs) {
if (mbr.equals(member)) {
include = false;
break;
}
- if (include) result.add(member);
+ }
+ if (include) {
+ result.add(member);
+ }
}
return result.toArray(new Member[0]);
}
@@ -848,20 +904,27 @@ public abstract class AbstractReplicatedMap<K,V>
synchronized (mapMembers) {
removed = (mapMembers.remove(member) != null );
if (!removed) {
- if (log.isDebugEnabled()) log.debug("Member["+member+"] disappeared, but was not present in the map.");
+ if (log.isDebugEnabled()) {
+ log.debug("Member["+member+"] disappeared, but was not present in the map.");
+ }
return; //the member was not part of our map.
}
}
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info(sm.getString("abstractReplicatedMap.member.disappeared", member));
+ }
long start = System.currentTimeMillis();
Iterator<Map.Entry<K,MapEntry<K,V>>> i = innerMap.entrySet().iterator();
while (i.hasNext()) {
Map.Entry<K,MapEntry<K,V>> e = i.next();
MapEntry<K,V> entry = innerMap.get(e.getKey());
- if (entry==null) continue;
+ if (entry==null) {
+ continue;
+ }
if (entry.isPrimary() && inSet(member,entry.getBackupNodes())) {
- if (log.isDebugEnabled()) log.debug("[1] Primary choosing a new backup");
+ if (log.isDebugEnabled()) {
+ log.debug("[1] Primary choosing a new backup");
+ }
try {
Member[] backup = publishEntryInfo(entry.getKey(), entry.getValue());
entry.setBackupNodes(backup);
@@ -870,7 +933,9 @@ public abstract class AbstractReplicatedMap<K,V>
log.error(sm.getString("abstractReplicatedMap.unable.relocate", entry.getKey()), x);
}
} else if (member.equals(entry.getPrimary())) {
- if (log.isDebugEnabled()) log.debug("[2] Primary disappeared");
+ if (log.isDebugEnabled()) {
+ log.debug("[2] Primary disappeared");
+ }
entry.setPrimary(null);
} //end if
@@ -880,7 +945,9 @@ public abstract class AbstractReplicatedMap<K,V>
entry.getBackupNodes().length == 1 &&
entry.getBackupNodes()[0].equals(member) ) {
//remove proxies that have no backup nor primaries
- if (log.isDebugEnabled()) log.debug("[3] Removing orphaned proxy");
+ if (log.isDebugEnabled()) {
+ log.debug("[3] Removing orphaned proxy");
+ }
i.remove();
} else if ( entry.getPrimary() == null &&
entry.isBackup() &&
@@ -888,14 +955,18 @@ public abstract class AbstractReplicatedMap<K,V>
entry.getBackupNodes().length == 1 &&
entry.getBackupNodes()[0].equals(channel.getLocalMember(false)) ) {
try {
- if (log.isDebugEnabled()) log.debug("[4] Backup becoming primary");
+ if (log.isDebugEnabled()) {
+ log.debug("[4] Backup becoming primary");
+ }
entry.setPrimary(channel.getLocalMember(false));
entry.setBackup(false);
entry.setProxy(false);
entry.setCopy(false);
Member[] backup = publishEntryInfo(entry.getKey(), entry.getValue());
entry.setBackupNodes(backup);
- if ( mapOwner!=null ) mapOwner.objectMadePrimary(entry.getKey(),entry.getValue());
+ if ( mapOwner!=null ) {
+ mapOwner.objectMadePrimary(entry.getKey(),entry.getValue());
+ }
} catch (ChannelException x) {
log.error(sm.getString("abstractReplicatedMap.unable.relocate", entry.getKey()), x);
@@ -904,13 +975,17 @@ public abstract class AbstractReplicatedMap<K,V>
} //while
long complete = System.currentTimeMillis() - start;
- if (log.isInfoEnabled()) log.info(sm.getString("abstractReplicatedMap.relocate.complete",
- Long.toString(complete)));
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("abstractReplicatedMap.relocate.complete",
+ Long.toString(complete)));
+ }
}
public int getNextBackupIndex() {
int size = mapMembers.size();
- if (mapMembers.size() == 0)return -1;
+ if (mapMembers.size() == 0) {
+ return -1;
+ }
int node = currentNode++;
if (node >= size) {
node = 0;
@@ -921,8 +996,12 @@ public abstract class AbstractReplicatedMap<K,V>
public Member getNextBackupNode() {
Member[] members = getMapMembers();
int node = getNextBackupIndex();
- if ( members.length == 0 || node==-1) return null;
- if ( node >= members.length ) node = 0;
+ if ( members.length == 0 || node==-1) {
+ return null;
+ }
+ if ( node >= members.length ) {
+ node = 0;
+ }
return members[node];
}
@@ -931,7 +1010,9 @@ public abstract class AbstractReplicatedMap<K,V>
@Override
public void heartbeat() {
try {
- if (this.state.isAvailable()) ping(accessTimeout);
+ if (this.state.isAvailable()) {
+ ping(accessTimeout);
+ }
}catch ( Exception x ) {
log.error(sm.getString("abstractReplicatedMap.heartbeat.failed"),x);
}
@@ -973,8 +1054,12 @@ public abstract class AbstractReplicatedMap<K,V>
@Override
public V get(Object key) {
MapEntry<K,V> entry = innerMap.get(key);
- if (log.isTraceEnabled()) log.trace("Requesting id:"+key+" entry:"+entry);
- if ( entry == null ) return null;
+ if (log.isTraceEnabled()) {
+ log.trace("Requesting id:"+key+" entry:"+entry);
+ }
+ if ( entry == null ) {
+ return null;
+ }
if ( !entry.isPrimary() ) {
//if the message is not primary, we need to retrieve the latest value
try {
@@ -996,7 +1081,9 @@ public abstract class AbstractReplicatedMap<K,V>
msg = (MapMessage) resp[0].getMessage();
msg.deserialize(getExternalLoaders());
backup = entry.getBackupNodes();
- if ( msg.getValue()!=null ) entry.setValue((V) msg.getValue());
+ if ( msg.getValue()!=null ) {
+ entry.setValue((V) msg.getValue());
+ }
// notify member
msg = new MapMessage(getMapContextName(), MapMessage.MSG_NOTIFY_MAPMEMBER,false,
@@ -1028,14 +1115,18 @@ public abstract class AbstractReplicatedMap<K,V>
entry.setBackup(false);
entry.setProxy(false);
entry.setCopy(false);
- if ( getMapOwner()!=null ) getMapOwner().objectMadePrimary(key, entry.getValue());
+ if ( getMapOwner()!=null ) {
+ getMapOwner().objectMadePrimary(key, entry.getValue());
+ }
} catch (RuntimeException | ChannelException | ClassNotFoundException | IOException x) {
log.error(sm.getString("abstractReplicatedMap.unable.get"), x);
return null;
}
}
- if (log.isTraceEnabled()) log.trace("Requesting id:"+key+" result:"+entry.getValue());
+ if (log.isTraceEnabled()) {
+ log.trace("Requesting id:"+key+" result:"+entry.getValue());
+ }
return entry.getValue();
}
@@ -1090,7 +1181,9 @@ public abstract class AbstractReplicatedMap<K,V>
V old = null;
//make sure that any old values get removed
- if ( containsKey(key) ) old = remove(key);
+ if ( containsKey(key) ) {
+ old = remove(key);
+ }
try {
if ( notify ) {
Member[] backup = publishEntryInfo(key, value);
@@ -1138,7 +1231,9 @@ public abstract class AbstractReplicatedMap<K,V>
Objects.requireNonNull(value);
for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
- if (entry!=null && entry.isActive() && value.equals(entry.getValue())) return true;
+ if (entry!=null && entry.isActive() && value.equals(entry.getValue())) {
+ return true;
+ }
}
return false;
}
@@ -1182,7 +1277,9 @@ public abstract class AbstractReplicatedMap<K,V>
for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
K key = e.getKey();
MapEntry<K,V> entry = innerMap.get(key);
- if ( entry!=null && entry.isActive() ) set.add(key);
+ if ( entry!=null && entry.isActive() ) {
+ set.add(key);
+ }
}
return Collections.unmodifiableSet(set);
@@ -1199,7 +1296,9 @@ public abstract class AbstractReplicatedMap<K,V>
Map.Entry<?,?> e = it.next();
if ( e != null ) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
- if (entry!=null && entry.isActive() && entry.getValue() != null) counter++;
+ if (entry!=null && entry.isActive() && entry.getValue() != null) {
+ counter++;
+ }
}
}
return counter;
@@ -1215,7 +1314,9 @@ public abstract class AbstractReplicatedMap<K,V>
ArrayList<V> values = new ArrayList<>();
for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
- if (entry!=null && entry.isActive() && entry.getValue()!=null) values.add(entry.getValue());
+ if (entry!=null && entry.isActive() && entry.getValue()!=null) {
+ values.add(entry.getValue());
+ }
}
return Collections.unmodifiableCollection(values);
}
@@ -1478,8 +1579,12 @@ public abstract class AbstractReplicatedMap<K,V>
}
public Serializable key(ClassLoader[] cls) throws IOException, ClassNotFoundException {
- if ( key!=null ) return key;
- if ( keydata == null || keydata.length == 0 ) return null;
+ if ( key!=null ) {
+ return key;
+ }
+ if ( keydata == null || keydata.length == 0 ) {
+ return null;
+ }
key = XByteBuffer.deserialize(keydata,0,keydata.length,cls);
keydata = null;
return key;
@@ -1498,8 +1603,12 @@ public abstract class AbstractReplicatedMap<K,V>
}
public Serializable value(ClassLoader[] cls) throws IOException, ClassNotFoundException {
- if ( value!=null ) return value;
- if ( valuedata == null || valuedata.length == 0 ) return null;
+ if ( value!=null ) {
+ return value;
+ }
+ if ( valuedata == null || valuedata.length == 0 ) {
+ return null;
+ }
value = XByteBuffer.deserialize(valuedata,0,valuedata.length,cls);
valuedata = null;
return value;
@@ -1531,7 +1640,9 @@ public abstract class AbstractReplicatedMap<K,V>
public void setValue(Serializable value) {
try {
- if ( value != null ) valuedata = XByteBuffer.serialize(value);
+ if ( value != null ) {
+ valuedata = XByteBuffer.serialize(value);
+ }
this.value = value;
}catch ( IOException x ) {
throw new RuntimeException(x);
@@ -1540,7 +1651,9 @@ public abstract class AbstractReplicatedMap<K,V>
public void setKey(Serializable key) {
try {
- if (key != null) keydata = XByteBuffer.serialize(key);
+ if (key != null) {
+ keydata = XByteBuffer.serialize(key);
+ }
this.key = key;
} catch (IOException x) {
throw new RuntimeException(x);
diff --git a/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
index 59cfafd..d0a6cff 100644
--- a/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
@@ -150,14 +150,18 @@ public class LazyReplicatedMap<K,V> extends AbstractReplicatedMap<K,V> {
@Override
protected Member[] publishEntryInfo(Object key, Object value) throws ChannelException {
Log log = getLog();
- if (! (key instanceof Serializable && value instanceof Serializable) ) return new Member[0];
+ if (! (key instanceof Serializable && value instanceof Serializable) ) {
+ return new Member[0];
+ }
Member[] members = getMapMembers();
int firstIdx = getNextBackupIndex();
int nextIdx = firstIdx;
Member[] backup = new Member[0];
//there are no backups
- if ( members.length == 0 || firstIdx == -1 ) return backup;
+ if ( members.length == 0 || firstIdx == -1 ) {
+ return backup;
+ }
boolean success = false;
do {
@@ -166,7 +170,9 @@ public class LazyReplicatedMap<K,V> extends AbstractReplicatedMap<K,V> {
//increment for the next round of back up selection
nextIdx = nextIdx + 1;
- if ( nextIdx >= members.length ) nextIdx = 0;
+ if ( nextIdx >= members.length ) {
+ nextIdx = 0;
+ }
if (next == null) {
continue;
@@ -177,11 +183,13 @@ public class LazyReplicatedMap<K,V> extends AbstractReplicatedMap<K,V> {
//publish the backup data to one node
msg = new MapMessage(getMapContextName(), MapMessage.MSG_BACKUP, false,
(Serializable) key, (Serializable) value, null, channel.getLocalMember(false), tmpBackup);
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("Publishing backup data:"+msg+" to: "+next.getName());
+ }
UniqueId id = getChannel().send(tmpBackup, msg, getChannelSendOptions());
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("Data published:"+msg+" msg Id:"+id);
+ }
//we published out to a backup, mark the test success
success = true;
backup = tmpBackup;
@@ -195,8 +203,9 @@ public class LazyReplicatedMap<K,V> extends AbstractReplicatedMap<K,V> {
if (success && proxies.length > 0 ) {
msg = new MapMessage(getMapContextName(), MapMessage.MSG_PROXY, false,
(Serializable) key, null, null, channel.getLocalMember(false),backup);
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("Publishing proxy data:"+msg+" to: "+Arrays.toNameString(proxies));
+ }
getChannel().send(proxies, msg, getChannelSendOptions());
}
}catch ( ChannelException x ) {
diff --git a/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
index ac6cbda..cc01312 100644
--- a/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
@@ -138,11 +138,15 @@ public class ReplicatedMap<K,V> extends AbstractReplicatedMap<K,V> {
*/
@Override
protected Member[] publishEntryInfo(Object key, Object value) throws ChannelException {
- if (! (key instanceof Serializable && value instanceof Serializable) ) return new Member[0];
+ if (! (key instanceof Serializable && value instanceof Serializable) ) {
+ return new Member[0];
+ }
//select a backup node
Member[] backup = getMapMembers();
- if (backup == null || backup.length == 0) return null;
+ if (backup == null || backup.length == 0) {
+ return null;
+ }
try {
//publish the data out to all nodes
@@ -152,7 +156,9 @@ public class ReplicatedMap<K,V> extends AbstractReplicatedMap<K,V> {
getChannel().send(backup, msg, getChannelSendOptions());
} catch (ChannelException e) {
FaultyMember[] faultyMembers = e.getFaultyMembers();
- if (faultyMembers.length == 0) throw e;
+ if (faultyMembers.length == 0) {
+ throw e;
+ }
List<Member> faulty = new ArrayList<>();
for (FaultyMember faultyMember : faultyMembers) {
if (!(faultyMember.getCause() instanceof RemoteProcessException)) {
@@ -182,16 +188,21 @@ public class ReplicatedMap<K,V> extends AbstractReplicatedMap<K,V> {
synchronized (mapMembers) {
removed = (mapMembers.remove(member) != null );
if (!removed) {
- if (log.isDebugEnabled()) log.debug("Member["+member+"] disappeared, but was not present in the map.");
+ if (log.isDebugEnabled()) {
+ log.debug("Member["+member+"] disappeared, but was not present in the map.");
+ }
return; //the member was not part of our map.
}
}
- if (log.isInfoEnabled())
+ if (log.isInfoEnabled()) {
log.info(sm.getString("replicatedMap.member.disappeared", member));
+ }
long start = System.currentTimeMillis();
for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
- if (entry==null) continue;
+ if (entry==null) {
+ continue;
+ }
if (entry.isPrimary()) {
try {
Member[] backup = getMapMembers();
@@ -226,7 +237,9 @@ public class ReplicatedMap<K,V> extends AbstractReplicatedMap<K,V> {
getChannel().send(backup, msg, getChannelSendOptions());
}
entry.setBackupNodes(backup);
- if ( mapOwner!=null ) mapOwner.objectMadePrimary(entry.getKey(),entry.getValue());
+ if ( mapOwner!=null ) {
+ mapOwner.objectMadePrimary(entry.getKey(),entry.getValue());
+ }
} catch (ChannelException x) {
log.error(sm.getString("replicatedMap.unable.relocate", entry.getKey()), x);
@@ -235,13 +248,17 @@ public class ReplicatedMap<K,V> extends AbstractReplicatedMap<K,V> {
} //while
long complete = System.currentTimeMillis() - start;
- if (log.isInfoEnabled()) log.info(sm.getString("replicatedMap.relocate.complete",
- Long.toString(complete)));
+ if (log.isInfoEnabled()) {
+ log.info(sm.getString("replicatedMap.relocate.complete",
+ Long.toString(complete)));
+ }
}
@Override
public void mapMemberAdded(Member member) {
- if ( member.equals(getChannel().getLocalMember(false)) ) return;
+ if ( member.equals(getChannel().getLocalMember(false)) ) {
+ return;
+ }
boolean memberAdded = false;
synchronized (mapMembers) {
if (!mapMembers.containsKey(member) ) {
@@ -254,7 +271,9 @@ public class ReplicatedMap<K,V> extends AbstractReplicatedMap<K,V> {
Member[] backup = getMapMembers();
for (Entry<K, MapEntry<K, V>> e : innerMap.entrySet()) {
MapEntry<K,V> entry = innerMap.get(e.getKey());
- if ( entry == null ) continue;
+ if ( entry == null ) {
+ continue;
+ }
if (entry.isPrimary() && !inSet(member,entry.getBackupNodes())) {
entry.setBackupNodes(backup);
}
diff --git a/java/org/apache/catalina/tribes/transport/AbstractSender.java b/java/org/apache/catalina/tribes/transport/AbstractSender.java
index 77be39e..b12d59a 100644
--- a/java/org/apache/catalina/tribes/transport/AbstractSender.java
+++ b/java/org/apache/catalina/tribes/transport/AbstractSender.java
@@ -110,10 +110,16 @@ public abstract class AbstractSender implements DataSender {
@Override
public boolean keepalive() {
boolean disconnect = false;
- if (isUdpBased()) disconnect = true; //always disconnect UDP, TODO optimize the keepalive handling
- else if ( keepAliveCount >= 0 && requestCount>keepAliveCount ) disconnect = true;
- else if ( keepAliveTime >= 0 && (System.currentTimeMillis()-connectTime)>keepAliveTime ) disconnect = true;
- if ( disconnect ) disconnect();
+ if (isUdpBased()) {
+ disconnect = true; //always disconnect UDP, TODO optimize the keepalive handling
+ } else if ( keepAliveCount >= 0 && requestCount>keepAliveCount ) {
+ disconnect = true;
+ } else if ( keepAliveTime >= 0 && (System.currentTimeMillis()-connectTime)>keepAliveTime ) {
+ disconnect = true;
+ }
+ if ( disconnect ) {
+ disconnect();
+ }
return disconnect;
}
diff --git a/java/org/apache/catalina/tribes/transport/PooledSender.java b/java/org/apache/catalina/tribes/transport/PooledSender.java
index db8079e..060a33e 100644
--- a/java/org/apache/catalina/tribes/transport/PooledSender.java
+++ b/java/org/apache/catalina/tribes/transport/PooledSender.java
@@ -160,7 +160,9 @@ public abstract class PooledSender extends AbstractSender implements MultiPointS
public synchronized DataSender getSender(long timeout) {
long start = System.currentTimeMillis();
while ( true ) {
- if (!isOpen)throw new IllegalStateException(sm.getString("pooledSender.closed.queue"));
+ if (!isOpen) {
+ throw new IllegalStateException(sm.getString("pooledSender.closed.queue"));
+ }
DataSender sender = null;
if (notinuse.size() == 0 && inuse.size() < limit) {
sender = parent.getNewDataSender();
@@ -172,8 +174,9 @@ public abstract class PooledSender extends AbstractSender implements MultiPointS
return sender;
}//end if
long delta = System.currentTimeMillis() - start;
- if ( delta > timeout && timeout>0) return null;
- else {
+ if ( delta > timeout && timeout>0) {
+ return null;
+ } else {
try {
wait(Math.max(timeout - delta,1));
}catch (InterruptedException x){}
@@ -189,8 +192,9 @@ public abstract class PooledSender extends AbstractSender implements MultiPointS
//to do
inuse.remove(sender);
//just in case the limit has changed
- if ( notinuse.size() < this.getLimit() ) notinuse.add(sender);
- else
+ if ( notinuse.size() < this.getLimit() ) {
+ notinuse.add(sender);
+ } else {
try {
sender.disconnect();
} catch (Exception e) {
@@ -199,6 +203,7 @@ public abstract class PooledSender extends AbstractSender implements MultiPointS
"PooledSender.senderDisconnectFail"), e);
}
}
+ }
notifyAll();
}
diff --git a/java/org/apache/catalina/tribes/transport/ReceiverBase.java b/java/org/apache/catalina/tribes/transport/ReceiverBase.java
index dd769cd..20547cc 100644
--- a/java/org/apache/catalina/tribes/transport/ReceiverBase.java
+++ b/java/org/apache/catalina/tribes/transport/ReceiverBase.java
@@ -99,22 +99,31 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R
if ( executor == null ) {
//executor = new ThreadPoolExecutor(minThreads,maxThreads,60,TimeUnit.SECONDS,new LinkedBlockingQueue<Runnable>());
String channelName = "";
- if (channel.getName() != null) channelName = "[" + channel.getName() + "]";
+ if (channel.getName() != null) {
+ channelName = "[" + channel.getName() + "]";
+ }
TaskThreadFactory tf = new TaskThreadFactory("Tribes-Task-Receiver" + channelName + "-");
executor = ExecutorFactory.newThreadPool(minThreads, maxThreads, maxIdleTime, TimeUnit.MILLISECONDS, tf);
}
// register jmx
JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel);
- if (jmxRegistry != null) this.oname = jmxRegistry.registerJmx(",component=Receiver", this);
+ if (jmxRegistry != null) {
+ this.oname = jmxRegistry.registerJmx(",component=Receiver", this);
+ }
}
@Override
public void stop() {
- if ( executor != null ) executor.shutdownNow();//ignore left overs
+ if ( executor != null )
+ {
+ executor.shutdownNow();//ignore left overs
+ }
executor = null;
if (oname != null) {
JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel);
- if (jmxRegistry != null) jmxRegistry.unregisterJmx(oname);
+ if (jmxRegistry != null) {
+ jmxRegistry.unregisterJmx(oname);
+ }
oname = null;
}
channel = null;
@@ -174,8 +183,9 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R
if ("auto".equals(host)) {
host = java.net.InetAddress.getLocalHost().getHostAddress();
}
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("Starting replication listener on address:"+ host);
+ }
bind = java.net.InetAddress.getByName(host);
} catch (IOException ioe) {
log.error(sm.getString("receiverBase.bind.failed", host), ioe);
@@ -258,13 +268,17 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R
@Override
public void messageDataReceived(ChannelMessage data) {
if ( this.listener != null ) {
- if ( listener.accept(data) ) listener.messageReceived(data);
+ if ( listener.accept(data) ) {
+ listener.messageReceived(data);
+ }
}
}
public int getWorkerThreadOptions() {
int options = 0;
- if ( getDirect() ) options = options | OPTION_DIRECT_BUFFER;
+ if ( getDirect() ) {
+ options = options | OPTION_DIRECT_BUFFER;
+ }
return options;
}
@@ -413,7 +427,9 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, R
public void setAutoBind(int autoBind) {
this.autoBind = autoBind;
- if ( this.autoBind <= 0 ) this.autoBind = 1;
+ if ( this.autoBind <= 0 ) {
+ this.autoBind = 1;
+ }
}
public void setMaxThreads(int maxThreads) {
diff --git a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
index 2ecde8a..a67cc5e 100644
--- a/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
+++ b/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
@@ -76,7 +76,9 @@ public class ReplicationTransmitter implements ChannelSender {
getTransport().connect();
// register jmx
JmxRegistry jmxRegistry = JmxRegistry.getRegistry(channel);
- if (jmxRegistry != null) this.oname = jmxRegistry.registerJmx(",component=Sender", transport);
+ if (jmxRegistry != null) {
+ this.oname = jmxRegistry.registerJmx(",component=Sender", transport);
+ }
}
/**
@@ -101,7 +103,9 @@ public class ReplicationTransmitter implements ChannelSender {
*/
@Override
public void heartbeat() {
- if (getTransport()!=null) getTransport().keepalive();
+ if (getTransport()!=null) {
+ getTransport().keepalive();
+ }
}
/**
diff --git a/java/org/apache/catalina/tribes/transport/RxTaskPool.java b/java/org/apache/catalina/tribes/transport/RxTaskPool.java
index d370fc3..4182e24 100644
--- a/java/org/apache/catalina/tribes/transport/RxTaskPool.java
+++ b/java/org/apache/catalina/tribes/transport/RxTaskPool.java
@@ -84,7 +84,9 @@ public class RxTaskPool {
}
}
}//while
- if ( worker != null ) used.add(worker);
+ if ( worker != null ) {
+ used.add(worker);
+ }
}
return worker;
}
@@ -103,8 +105,9 @@ public class RxTaskPool {
synchronized (mutex) {
used.remove(worker);
//if ( idle.size() < minThreads && !idle.contains(worker)) idle.add(worker);
- if ( idle.size() < maxTasks && !idle.contains(worker)) idle.add(worker); //let max be the upper limit
- else {
+ if ( idle.size() < maxTasks && !idle.contains(worker)) {
+ idle.add(worker); //let max be the upper limit
+ } else {
worker.setDoRun(false);
synchronized (worker){worker.notifyAll();}
}
diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
index b4ed9da..c7ab654 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
@@ -82,21 +82,29 @@ public class NioReceiver extends ReceiverBase implements Runnable, NioReceiverMB
setPool(new RxTaskPool(getMaxThreads(),getMinThreads(),this));
} catch (Exception x) {
log.fatal(sm.getString("nioReceiver.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, "NioReceiver" + channelName);
t.setDaemon(true);
t.start();
} catch (Exception x) {
log.fatal(sm.getString("nioReceiver.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());
+ }
}
}
@@ -182,21 +190,33 @@ public class NioReceiver extends ReceiverBase implements Runnable, NioReceiverMB
}
key.cancel();
key.attach(null);
- if (key.channel() instanceof SocketChannel)
- try { ((SocketChannel)key.channel()).socket().close(); } catch (IOException e) { if (log.isDebugEnabled()) log.debug("", e); }
- if (key.channel() instanceof DatagramChannel)
- try { ((DatagramChannel)key.channel()).socket().close(); } catch (Exception e) { if (log.isDebugEnabled()) log.debug("", e); }
- try { key.channel().close(); } catch (IOException e) { if (log.isDebugEnabled()) log.debug("", e); }
+ if (key.channel() instanceof SocketChannel) {
+ try { ((SocketChannel)key.channel()).socket().close(); } catch (IOException e) { if (log.isDebugEnabled()) {
+ log.debug("", e);
+ } }
+ }
+ if (key.channel() instanceof DatagramChannel) {
+ try { ((DatagramChannel)key.channel()).socket().close(); } catch (Exception e) { if (log.isDebugEnabled()) {
+ log.debug("", e);
+ } }
+ }
+ try { key.channel().close(); } catch (IOException e) { if (log.isDebugEnabled()) {
+ log.debug("", e);
+ } }
}
protected long lastCheck = System.currentTimeMillis();
protected void socketTimeouts() {
long now = System.currentTimeMillis();
- if ( (now-lastCheck) < getSelectorTimeout() ) return;
+ if ( (now-lastCheck) < getSelectorTimeout() ) {
+ return;
+ }
//timeout
Selector tmpsel = this.selector.get();
Set<SelectionKey> keys = (isListening()&&tmpsel!=null)?tmpsel.keys():null;
- if ( keys == null ) return;
+ if ( keys == null ) {
+ return;
+ }
for (Iterator<SelectionKey> iter = keys.iterator(); iter.hasNext();) {
SelectionKey key = iter.next();
try {
@@ -215,13 +235,14 @@ public class NioReceiver extends ReceiverBase implements Runnable, NioReceiverMB
if ( ka != null ) {
long delta = now - ka.getLastAccess();
if (delta > getTimeout() && (!ka.isAccessed())) {
- if (log.isWarnEnabled())
+ if (log.isWarnEnabled()) {
log.warn(sm.getString(
"nioReceiver.threadsExhausted",
Integer.valueOf(getTimeout()),
Boolean.valueOf(ka.isCancelled()),
key,
new java.sql.Timestamp(ka.getLastAccess())));
+ }
ka.setLastAccess(now);
//key.interestOps(SelectionKey.OP_READ);
}//end if
@@ -326,7 +347,9 @@ public class NioReceiver extends ReceiverBase implements Runnable, NioReceiverMB
try {
datagramChannel.close();
}catch (Exception iox) {
- if (log.isDebugEnabled()) log.debug("Unable to close datagram channel.",iox);
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to close datagram channel.",iox);
+ }
}
datagramChannel=null;
}
@@ -367,7 +390,9 @@ public class NioReceiver extends ReceiverBase implements Runnable, NioReceiverMB
private void closeSelector() throws IOException {
Selector selector = this.selector.getAndSet(null);
- if (selector == null) return;
+ if (selector == null) {
+ return;
+ }
try {
// look at each key in the selected set
for (SelectionKey key : selector.keys()) {
@@ -406,7 +431,10 @@ public class NioReceiver extends ReceiverBase implements Runnable, NioReceiverMB
SelectableChannel channel,
int ops,
Object attach) throws Exception {
- if (channel == null)return; // could happen
+ if (channel == null)
+ {
+ return; // could happen
+ }
// set the new channel non-blocking
channel.configureBlocking(false);
// register it with the selector
@@ -446,7 +474,9 @@ public class NioReceiver extends ReceiverBase implements Runnable, NioReceiverMB
// loop will keep calling this method until a
// thread becomes available, the thread pool itself has a waiting mechanism
// so we will not wait here.
- if (log.isDebugEnabled()) log.debug("No TcpReplicationThread available");
+ if (log.isDebugEnabled()) {
+ log.debug("No TcpReplicationThread available");
+ }
} else {
// invoking this wakes up the worker thread then returns
//add task to thread pool
diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
index 6ee8c82..f898d14 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
@@ -85,18 +85,21 @@ public class NioReplicationTask extends AbstractRxTask {
if (key == null) {
return; // just in case
}
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("Servicing key:"+key);
+ }
try {
ObjectReader reader = (ObjectReader)key.attachment();
if ( reader == null ) {
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("No object reader, cancelling:"+key);
+ }
cancelKey(key);
} else {
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("Draining channel:"+key);
+ }
drainChannel(key, reader);
}
@@ -107,8 +110,11 @@ public class NioReplicationTask extends AbstractRxTask {
//do nothing
} else if ( e instanceof IOException ) {
//don't spew out stack traces for IO exceptions unless debug is enabled.
- if (log.isDebugEnabled()) log.debug ("IOException in replication worker, unable to drain channel. Probable cause: Keep alive socket closed["+e.getMessage()+"].", e);
- else log.warn (sm.getString("nioReplicationTask.unable.drainChannel.ioe", e.getMessage()));
+ if (log.isDebugEnabled()) {
+ log.debug ("IOException in replication worker, unable to drain channel. Probable cause: Keep alive socket closed["+e.getMessage()+"].", e);
+ } else {
+ log.warn (sm.getString("nioReplicationTask.unable.drainChannel.ioe", e.getMessage()));
+ }
} else if ( log.isErrorEnabled() ) {
//this is a real error, log it.
log.error(sm.getString("nioReplicationTask.exception.drainChannel"),e);
@@ -133,9 +139,13 @@ public class NioReplicationTask extends AbstractRxTask {
* @param key The key to process
*/
public synchronized void serviceChannel (SelectionKey key) {
- if ( log.isTraceEnabled() ) log.trace("About to service key:"+key);
+ if ( log.isTraceEnabled() ) {
+ log.trace("About to service key:"+key);
+ }
ObjectReader reader = (ObjectReader)key.attachment();
- if ( reader != null ) reader.setLastAccess(System.currentTimeMillis());
+ if ( reader != null ) {
+ reader.setLastAccess(System.currentTimeMillis());
+ }
this.key = key;
key.interestOps (key.interestOps() & (~SelectionKey.OP_READ));
key.interestOps (key.interestOps() & (~SelectionKey.OP_WRITE));
@@ -163,22 +173,26 @@ public class NioReplicationTask extends AbstractRxTask {
// loop while data available, channel is non-blocking
while ((count = channel.read (buffer)) > 0) {
buffer.flip(); // make buffer readable
- if ( buffer.hasArray() )
+ if ( buffer.hasArray() ) {
reader.append(buffer.array(),0,count,false);
- else
+ } else {
reader.append(buffer,count,false);
+ }
buffer.clear(); // make buffer empty
//do we have at least one package?
- if ( reader.hasPackage() ) break;
+ if ( reader.hasPackage() ) {
+ break;
+ }
}
} else if (channel instanceof DatagramChannel) {
DatagramChannel dchannel = (DatagramChannel)channel;
saddr = dchannel.receive(buffer);
buffer.flip(); // make buffer readable
- if ( buffer.hasArray() )
+ if ( buffer.hasArray() ) {
reader.append(buffer.array(),0,buffer.limit()-buffer.position(),false);
- else
+ } else {
reader.append(buffer,buffer.limit()-buffer.position(),false);
+ }
buffer.clear(); // make buffer empty
//did we get a package
count = reader.hasPackage()?1:-1;
@@ -219,16 +233,21 @@ public class NioReplicationTask extends AbstractRxTask {
* server before sending the ack to the remote server
* This is considered a synchronized request
*/
- if (ChannelData.sendAckSync(msg.getOptions()))
+ if (ChannelData.sendAckSync(msg.getOptions())) {
sendAck(key, (WritableByteChannel) channel, Constants.ACK_COMMAND, saddr);
+ }
} catch (RemoteProcessException e) {
- if (log.isDebugEnabled()) log.error(sm.getString("nioReplicationTask.process.clusterMsg.failed"), e);
- if (ChannelData.sendAckSync(msg.getOptions()))
+ if (log.isDebugEnabled()) {
+ log.error(sm.getString("nioReplicationTask.process.clusterMsg.failed"), e);
+ }
+ if (ChannelData.sendAckSync(msg.getOptions())) {
sendAck(key, (WritableByteChannel) channel, Constants.FAIL_ACK_COMMAND, saddr);
+ }
} catch (Exception e) {
log.error(sm.getString("nioReplicationTask.process.clusterMsg.failed"), e);
- if (ChannelData.sendAckSync(msg.getOptions()))
+ if (ChannelData.sendAckSync(msg.getOptions())) {
sendAck(key, (WritableByteChannel) channel, Constants.FAIL_ACK_COMMAND, saddr);
+ }
}
if (getUseBufferPool()) {
BufferPool.getBufferPool().returnBuffer(msg.getMessage());
@@ -244,13 +263,16 @@ public class NioReplicationTask extends AbstractRxTask {
private void remoteEof(SelectionKey key) {
// close channel on EOF, invalidates the key
- if ( log.isDebugEnabled() ) log.debug("Channel closed on the remote end, disconnecting");
+ if ( log.isDebugEnabled() ) {
+ log.debug("Channel closed on the remote end, disconnecting");
+ }
cancelKey(key);
}
protected void registerForRead(final SelectionKey key, ObjectReader reader) {
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("Adding key for read event:"+key);
+ }
reader.finish();
//register our OP_READ interest
Runnable r = new Runnable() {
@@ -263,13 +285,15 @@ public class NioReplicationTask extends AbstractRxTask {
// resume interest in OP_READ, OP_WRITE
int resumeOps = key.interestOps() | SelectionKey.OP_READ;
key.interestOps(resumeOps);
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("Registering key for read:"+key);
+ }
}
} catch (CancelledKeyException ckx ) {
NioReceiver.cancelledKey(key);
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("CKX Cancelling key:"+key);
+ }
} catch (Exception x) {
log.error(sm.getString("nioReplicationTask.error.register.key", key),x);
@@ -280,8 +304,9 @@ public class NioReplicationTask extends AbstractRxTask {
}
private void cancelKey(final SelectionKey key) {
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("Adding key for cancel event:"+key);
+ }
ObjectReader reader = (ObjectReader)key.attachment();
if ( reader != null ) {
@@ -291,8 +316,9 @@ public class NioReplicationTask extends AbstractRxTask {
Runnable cx = new Runnable() {
@Override
public void run() {
- if ( log.isTraceEnabled() )
+ if ( log.isTraceEnabled() ) {
log.trace("Cancelling key:"+key);
+ }
NioReceiver.cancelledKey(key);
}
diff --git a/java/org/apache/catalina/tribes/transport/nio/NioSender.java b/java/org/apache/catalina/tribes/transport/nio/NioSender.java
index 6354dee..9b2e8bd 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioSender.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioSender.java
@@ -85,12 +85,18 @@ public class NioSender extends AbstractSender {
int ops = key.readyOps();
key.interestOps(key.interestOps() & ~ops);
//in case disconnect has been called
- if ((!isConnected()) && (!connecting)) throw new IOException(sm.getString("nioSender.sender.disconnected"));
- if ( !key.isValid() ) throw new IOException(sm.getString("nioSender.key.inValid"));
+ if ((!isConnected()) && (!connecting)) {
+ throw new IOException(sm.getString("nioSender.sender.disconnected"));
+ }
+ if ( !key.isValid() ) {
+ throw new IOException(sm.getString("nioSender.key.inValid"));
+ }
if ( key.isConnectable() ) {
if ( socketChannel.finishConnect() ) {
completeConnect();
- if ( current != null ) key.interestOps(key.interestOps() | SelectionKey.OP_WRITE);
+ if ( current != null ) {
+ key.interestOps(key.interestOps() | SelectionKey.OP_WRITE);
+ }
return false;
} else {
//wait for the connection to finish
@@ -167,12 +173,16 @@ public class NioSender extends AbstractSender {
protected boolean read() throws IOException {
//if there is no message here, we are done
- if ( current == null ) return true;
+ if ( current == null ) {
+ return true;
+ }
int read = isUdpBased()?dataChannel.read(readbuf) : socketChannel.read(readbuf);
//end of stream
- if ( read == -1 ) throw new IOException(sm.getString("nioSender.unable.receive.ack"));
- //no data read
- else if ( read == 0 ) return false;
+ if ( read == -1 ) {
+ throw new IOException(sm.getString("nioSender.unable.receive.ack"));
+ } else if ( read == 0 ) {
+ return false;
+ }
readbuf.flip();
ackbuf.append(readbuf,read);
readbuf.clear();
@@ -180,7 +190,9 @@ public class NioSender extends AbstractSender {
byte[] ackcmd = ackbuf.extractDataPackage(true).getBytes();
boolean ack = Arrays.equals(ackcmd,org.apache.catalina.tribes.transport.Constants.ACK_DATA);
boolean fack = Arrays.equals(ackcmd,org.apache.catalina.tribes.transport.Constants.FAIL_ACK_DATA);
- if ( fack && getThrowOnFailedAck() ) throw new RemoteProcessException(sm.getString("nioSender.receive.failedAck"));
+ if ( fack && getThrowOnFailedAck() ) {
+ throw new RemoteProcessException(sm.getString("nioSender.receive.failedAck"));
+ }
return ack || fack;
} else {
return false;
@@ -197,7 +209,9 @@ public class NioSender extends AbstractSender {
//we have written everything, or we are starting a new package
//protect against buffer overwrite
int byteswritten = isUdpBased()?dataChannel.write(writebuf) : socketChannel.write(writebuf);
- if (byteswritten == -1 ) throw new EOFException();
+ if (byteswritten == -1 ) {
+ throw new EOFException();
+ }
remaining -= byteswritten;
//if the entire message was written from the buffer
//reset the position counter
@@ -219,9 +233,13 @@ public class NioSender extends AbstractSender {
*/
@Override
public synchronized void connect() throws IOException {
- if ( connecting || isConnected()) return;
+ if ( connecting || isConnected()) {
+ return;
+ }
connecting = true;
- if ( isConnected() ) throw new IOException(sm.getString("nioSender.already.connected"));
+ if ( isConnected() ) {
+ throw new IOException(sm.getString("nioSender.already.connected"));
+ }
if ( readbuf == null ) {
readbuf = getReadBuffer();
} else {
@@ -235,7 +253,9 @@ public class NioSender extends AbstractSender {
if (isUdpBased()) {
InetSocketAddress daddr = new InetSocketAddress(getAddress(),getUdpPort());
- if ( dataChannel != null ) throw new IOException(sm.getString("nioSender.datagram.already.established"));
+ if ( dataChannel != null ) {
+ throw new IOException(sm.getString("nioSender.datagram.already.established"));
+ }
dataChannel = DatagramChannel.open();
configureSocket();
dataChannel.connect(daddr);
@@ -244,7 +264,9 @@ public class NioSender extends AbstractSender {
} else {
InetSocketAddress addr = new InetSocketAddress(getAddress(),getPort());
- if ( socketChannel != null ) throw new IOException(sm.getString("nioSender.socketChannel.already.established"));
+ if ( socketChannel != null ) {
+ throw new IOException(sm.getString("nioSender.socketChannel.already.established"));
+ }
socketChannel = SocketChannel.open();
configureSocket();
if ( socketChannel.connect(addr) ) {
@@ -309,7 +331,9 @@ public class NioSender extends AbstractSender {
}
} catch ( Exception x ) {
log.error(sm.getString("nioSender.unable.disconnect", x.getMessage()));
- if ( log.isDebugEnabled() ) log.debug(sm.getString("nioSender.unable.disconnect", x.getMessage()),x);
+ if ( log.isDebugEnabled() ) {
+ log.debug(sm.getString("nioSender.unable.disconnect", x.getMessage()),x);
+ }
}
}
@@ -317,8 +341,12 @@ public class NioSender extends AbstractSender {
if ( isConnected() && readbuf == null) {
readbuf = getReadBuffer();
}
- if ( readbuf != null ) readbuf.clear();
- if ( writebuf != null ) writebuf.clear();
+ if ( readbuf != null ) {
+ readbuf.clear();
+ }
+ if ( writebuf != null ) {
+ writebuf.clear();
+ }
current = null;
ackbuf.clear();
remaining = 0;
@@ -369,10 +397,11 @@ public class NioSender extends AbstractSender {
writebuf.put(data,offset,length);
writebuf.flip();
if (isConnected()) {
- if (isUdpBased())
+ if (isUdpBased()) {
dataChannel.register(getSelector(), SelectionKey.OP_WRITE, this);
- else
+ } else {
socketChannel.register(getSelector(), SelectionKey.OP_WRITE, this);
+ }
}
}
}
diff --git a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
index c41119f..632fe58 100644
--- a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
+++ b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
@@ -79,14 +79,22 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
remaining -= result.getCompleted();
if (result.getFailed() != null) {
remaining -= result.getFailed().getFaultyMembers().length;
- if (cx == null) cx = result.getFailed();
- else cx.addFaultyMember(result.getFailed().getFaultyMembers());
+ if (cx == null) {
+ cx = result.getFailed();
+ } else {
+ cx.addFaultyMember(result.getFailed().getFaultyMembers());
+ }
}
} catch (Exception x ) {
- if (log.isTraceEnabled()) log.trace("Error sending message", x);
+ if (log.isTraceEnabled()) {
+ log.trace("Error sending message", x);
+ }
if (cx == null) {
- if ( x instanceof ChannelException ) cx = (ChannelException)x;
- else cx = new ChannelException(sm.getString("parallelNioSender.send.failed"), x);
+ if ( x instanceof ChannelException ) {
+ cx = (ChannelException)x;
+ } else {
+ cx = new ChannelException(sm.getString("parallelNioSender.send.failed"), x);
+ }
}
for (NioSender sender : senders) {
if (!sender.isComplete()) {
@@ -121,8 +129,11 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
} catch (Exception e) {
// Ignore
}
- if ( x instanceof ChannelException ) throw (ChannelException)x;
- else throw new ChannelException(x);
+ if ( x instanceof ChannelException ) {
+ throw (ChannelException)x;
+ } else {
+ throw new ChannelException(x);
+ }
}
}
@@ -171,13 +182,16 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
synchronized (state) {
//sk.cancel();
- if (state.isSuspect()) state.setFailing();
+ if (state.isSuspect()) {
+ state.setFailing();
+ }
if (state.isReady()) {
state.setSuspect();
- if ( retry )
+ if ( retry ) {
log.warn(sm.getString("parallelNioSender.send.fail.retrying", sender.getDestination().getName()));
- else
+ } else {
log.warn(sm.getString("parallelNioSender.send.fail", sender.getDestination().getName()), x);
+ }
}
}
if ( !isConnected() ) {
@@ -215,13 +229,17 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
private List<NioSender> completeSenders = new ArrayList<>();
private ChannelException exception = null;
private void complete(NioSender sender) {
- if (!completeSenders.contains(sender)) completeSenders.add(sender);
+ if (!completeSenders.contains(sender)) {
+ completeSenders.add(sender);
+ }
}
private int getCompleted() {
return completeSenders.size();
}
private void failed(ChannelException cx){
- if (exception == null) exception = cx;
+ if (exception == null) {
+ exception = cx;
+ }
exception.addFaultyMember(cx.getFaultyMembers());
}
@@ -236,11 +254,15 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
try {
sender.connect();
} catch (IOException io) {
- if (x == null) x = new ChannelException(io);
+ if (x == null) {
+ x = new ChannelException(io);
+ }
x.addFaultyMember(sender.getDestination(), io);
}
}
- if ( x != null ) throw x;
+ if ( x != null ) {
+ throw x;
+ }
}
private void setData(NioSender[] senders, byte[] data) throws ChannelException {
@@ -249,11 +271,15 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
try {
sender.setMessage(data);
} catch (IOException io) {
- if (x == null) x = new ChannelException(io);
+ if (x == null) {
+ x = new ChannelException(io);
+ }
x.addFaultyMember(sender.getDestination(), io);
}
}
- if ( x != null ) throw x;
+ if ( x != null ) {
+ throw x;
+ }
}
@@ -275,12 +301,17 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
sender.setUdpBased(isUdpBased());
result[i] = sender;
}catch ( UnknownHostException x ) {
- if (cx == null) cx = new ChannelException(sm.getString("parallelNioSender.unable.setup.NioSender"), x);
+ if (cx == null) {
+ cx = new ChannelException(sm.getString("parallelNioSender.unable.setup.NioSender"), x);
+ }
cx.addFaultyMember(destination[i], x);
}
}
- if ( cx != null ) throw cx;
- else return result;
+ if ( cx != null ) {
+ throw cx;
+ } else {
+ return result;
+ }
}
@Override
@@ -299,12 +330,16 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
NioSender sender = nioSenders.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);
}
nioSenders.remove(mbr);
}
- if ( x != null ) throw x;
+ if ( x != null ) {
+ throw x;
+ }
}
@Override
@@ -316,7 +351,9 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
public void remove(Member member) {
//disconnect senders
NioSender sender = nioSenders.remove(member);
- if ( sender != null ) sender.disconnect();
+ if ( sender != null ) {
+ sender.disconnect();
+ }
}
@@ -368,7 +405,9 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende
}
}
//clean up any cancelled keys
- if ( result ) try { selector.selectNow(); }catch (Exception e){/*Ignore*/}
+ if ( result ) {
+ try { selector.selectNow(); }catch (Exception e){/*Ignore*/}
+ }
return result;
}
}
diff --git a/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java b/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
index 4abc3dd..0db604b 100644
--- a/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
+++ b/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
@@ -39,12 +39,15 @@ public class PooledParallelSender extends PooledSender implements PooledParallel
ChannelException cx = new ChannelException(sm.getString(
"pooledParallelSender.unable.retrieveSender.timeout",
Long.toString(getMaxWait())));
- for (Member member : destination)
+ for (Member member : destination) {
cx.addFaultyMember(member, new NullPointerException(sm.getString("pooledParallelSender.unable.retrieveSender")));
+ }
throw cx;
} else {
try {
- if (!sender.isConnected()) sender.connect();
+ if (!sender.isConnected()) {
+ sender.connect();
+ }
sender.sendMessage(destination, message);
sender.keepalive();
} catch (ChannelException x) {
diff --git a/java/org/apache/catalina/tribes/util/Arrays.java b/java/org/apache/catalina/tribes/util/Arrays.java
index eec9e08..78895a5 100644
--- a/java/org/apache/catalina/tribes/util/Arrays.java
+++ b/java/org/apache/catalina/tribes/util/Arrays.java
@@ -34,11 +34,19 @@ public class Arrays {
protected static final StringManager sm = StringManager.getManager(Arrays.class);
public static boolean contains(byte[] source, int srcoffset, byte[] key, int keyoffset, int length) {
- if ( srcoffset < 0 || srcoffset >= source.length) throw new ArrayIndexOutOfBoundsException(sm.getString("arrays.srcoffset.outOfBounds"));
- if ( keyoffset < 0 || keyoffset >= key.length) throw new ArrayIndexOutOfBoundsException(sm.getString("arrays.keyoffset.outOfBounds"));
- if ( length > (key.length-keyoffset) ) throw new ArrayIndexOutOfBoundsException(sm.getString("arrays.length.outOfBounds"));
+ if ( srcoffset < 0 || srcoffset >= source.length) {
+ throw new ArrayIndexOutOfBoundsException(sm.getString("arrays.srcoffset.outOfBounds"));
+ }
+ if ( keyoffset < 0 || keyoffset >= key.length) {
+ throw new ArrayIndexOutOfBoundsException(sm.getString("arrays.keyoffset.outOfBounds"));
+ }
+ if ( length > (key.length-keyoffset) ) {
+ throw new ArrayIndexOutOfBoundsException(sm.getString("arrays.length.outOfBounds"));
+ }
//we don't have enough data to validate it
- if ( length > (source.length-srcoffset) ) return false;
+ if ( length > (source.length-srcoffset) ) {
+ return false;
+ }
boolean match = true;
int pos = keyoffset;
for ( int i=srcoffset; match && i<length; i++ ) {
@@ -109,7 +117,9 @@ public class Arrays {
public static int add(int[] data) {
int result = 0;
- for (int datum : data) result += datum;
+ for (int datum : data) {
+ result += datum;
+ }
return result;
}
@@ -127,7 +137,11 @@ public class Arrays {
public static boolean equals(Object[] o1, Object[] o2) {
boolean result = o1.length == o2.length;
- if ( result ) for (int i=0; i<o1.length && result; i++ ) result = o1[i].equals(o2[i]);
+ if ( result ) {
+ for (int i=0; i<o1.length && result; i++ ) {
+ result = o1[i].equals(o2[i]);
+ }
+ }
return result;
}
@@ -141,7 +155,11 @@ public class Arrays {
AbsoluteOrder.absoluteOrder(m1);
AbsoluteOrder.absoluteOrder(m2);
ArrayList<Member> list = new ArrayList<>(java.util.Arrays.asList(m1));
- for (Member member : m2) if (!list.contains(member)) list.add(member);
+ for (Member member : m2) {
+ if (!list.contains(member)) {
+ list.add(member);
+ }
+ }
Member[] result = new Member[list.size()];
list.toArray(result);
AbsoluteOrder.absoluteOrder(result);
@@ -149,15 +167,21 @@ public class Arrays {
}
public static void fill(Membership mbrship, Member[] m) {
- for (Member member : m) mbrship.addMember(member);
+ for (Member member : m) {
+ mbrship.addMember(member);
+ }
}
public static Member[] diff(Membership complete, Membership local, Member ignore) {
ArrayList<Member> result = new ArrayList<>();
Member[] comp = complete.getMembers();
for (Member member : comp) {
- if (ignore != null && ignore.equals(member)) continue;
- if (local.getMember(member) == null) result.add(member);
+ if (ignore != null && ignore.equals(member)) {
+ continue;
+ }
+ if (local.getMember(member) == null) {
+ result.add(member);
+ }
}
return result.toArray(new Member[0]);
}
@@ -169,27 +193,35 @@ public class Arrays {
public static Member[] extract(Member[] all, Member[] remove) {
List<Member> alist = java.util.Arrays.asList(all);
ArrayList<Member> list = new ArrayList<>(alist);
- for (Member member : remove) list.remove(member);
+ for (Member member : remove) {
+ list.remove(member);
+ }
return list.toArray(new Member[0]);
}
public static int indexOf(Member member, Member[] members) {
int result = -1;
- for (int i=0; (result==-1) && (i<members.length); i++ )
- if ( member.equals(members[i]) ) result = i;
+ for (int i=0; (result==-1) && (i<members.length); i++ ) {
+ if ( member.equals(members[i]) ) {
+ result = i;
+ }
+ }
return result;
}
public static int nextIndex(Member member, Member[] members) {
int idx = indexOf(member,members)+1;
- if (idx >= members.length ) idx = ((members.length>0)?0:-1);
+ if (idx >= members.length ) {
+ idx = ((members.length>0)?0:-1);
+ }
return idx;
}
public static int hashCode(byte a[]) {
- if (a == null)
+ if (a == null) {
return 0;
+ }
int result = 1;
for (byte element : a) {
@@ -199,11 +231,17 @@ public class Arrays {
}
public static byte[] fromString(String value) {
- if ( value == null ) return null;
- if ( !value.startsWith("{") ) throw new RuntimeException(sm.getString("arrays.malformed.arrays"));
+ if ( value == null ) {
+ return null;
+ }
+ if ( !value.startsWith("{") ) {
+ throw new RuntimeException(sm.getString("arrays.malformed.arrays"));
+ }
StringTokenizer t = new StringTokenizer(value,"{,}",false);
byte[] result = new byte[t.countTokens()];
- for (int i=0; i<result.length; i++ ) result[i] = Byte.parseByte(t.nextToken());
+ for (int i=0; i<result.length; i++ ) {
+ result[i] = Byte.parseByte(t.nextToken());
+ }
return result;
}
diff --git a/java/org/apache/catalina/tribes/util/ExecutorFactory.java b/java/org/apache/catalina/tribes/util/ExecutorFactory.java
index cb67745..cce71ec 100644
--- a/java/org/apache/catalina/tribes/util/ExecutorFactory.java
+++ b/java/org/apache/catalina/tribes/util/ExecutorFactory.java
@@ -103,14 +103,22 @@ public class ExecutorFactory {
@Override
public boolean offer(Runnable o) {
//we can't do any checks
- if (parent==null) return super.offer(o);
+ if (parent==null) {
+ return super.offer(o);
+ }
//we are maxed out on threads, simply queue the object
- if (parent.getPoolSize() == parent.getMaximumPoolSize()) return super.offer(o);
+ if (parent.getPoolSize() == parent.getMaximumPoolSize()) {
+ return super.offer(o);
+ }
//we have idle threads, just add it to the queue
//this is an approximation, so it could use some tuning
- if (parent.getActiveCount()<(parent.getPoolSize())) return super.offer(o);
+ if (parent.getActiveCount()<(parent.getPoolSize())) {
+ return super.offer(o);
+ }
//if we have less threads than maximum force creation of a new thread
- if (parent.getPoolSize()<parent.getMaximumPoolSize()) return false;
+ if (parent.getPoolSize()<parent.getMaximumPoolSize()) {
+ return false;
+ }
//if we reached here, we need to add it to the queue
return super.offer(o);
}
diff --git a/java/org/apache/catalina/tribes/util/UUIDGenerator.java b/java/org/apache/catalina/tribes/util/UUIDGenerator.java
index 04148c8..99c34b4 100644
--- a/java/org/apache/catalina/tribes/util/UUIDGenerator.java
+++ b/java/org/apache/catalina/tribes/util/UUIDGenerator.java
@@ -57,10 +57,11 @@ public class UUIDGenerator {
}
public static byte[] randomUUID(boolean secure, byte[] into, int offset) {
- if ( (offset+UUID_LENGTH)>into.length )
+ if ( (offset+UUID_LENGTH)>into.length ) {
throw new ArrayIndexOutOfBoundsException(sm.getString("uuidGenerator.unable.fit",
Integer.toString(UUID_LENGTH), Integer.toString(into.length),
Integer.toString(offset+UUID_LENGTH)));
+ }
Random r = (secure&&(secrand!=null))?secrand:rand;
nextBytes(into,offset,UUID_LENGTH,r);
into[6+offset] &= 0x0F;
@@ -82,7 +83,9 @@ public class UUIDGenerator {
int numGot = 0, rnd = 0;
while (true) {
for (int i = 0; i < BYTES_PER_INT; i++) {
- if (numGot == numRequested) return;
+ if (numGot == numRequested) {
+ return;
+ }
rnd = (i == 0 ? r.nextInt() : rnd >> BITS_PER_BYTE);
into[offset+numGot] = (byte) rnd;
numGot++;
diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index 91a73f7..e8fc26a 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -53,7 +53,7 @@
<module name="AvoidNestedBlocks">
<property name="allowInSwitchCase" value="true"/>
</module>
- <!-- ~1500 errors
+ <!-- ~1000 errors
<module name="NeedBraces"/>
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org