This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cd88ea024c945d2f64d5ca36a20f6d3219f8b451
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 26 23:43:42 2021 +0100
Code clean-up. Fix remaining braces.
---
java/javax/servlet/http/HttpServlet.java | 72 +++++++++++++++-------
.../apache/catalina/ha/session/DeltaManager.java | 4 +-
.../apache/catalina/ha/session/DeltaSession.java | 8 ++-
java/org/apache/catalina/loader/WebappLoader.java | 3 +-
.../mbeans/JmxRemoteLifecycleListener.java | 15 +++--
java/org/apache/catalina/realm/JDBCRealm.java | 30 ++++++---
java/org/apache/catalina/session/JDBCStore.java | 30 ++++++---
.../catalina/tribes/io/BufferPool15Impl.java | 11 +++-
.../catalina/tribes/membership/MemberImpl.java | 10 +--
.../catalina/tribes/transport/bio/BioReceiver.java | 34 +++++++---
.../tribes/transport/bio/BioReplicationTask.java | 24 ++++++--
.../catalina/tribes/transport/bio/BioSender.java | 55 ++++++++++++-----
.../tribes/transport/bio/MultipointBioSender.java | 35 ++++++++---
.../tribes/transport/bio/PooledMultiSender.java | 7 ++-
java/org/apache/coyote/RequestInfo.java | 3 +-
java/org/apache/el/lang/ELSupport.java | 3 +-
java/org/apache/jasper/el/JspValueExpression.java | 36 ++++++++---
.../apache/jasper/runtime/JspContextWrapper.java | 3 +-
java/org/apache/jasper/tagplugins/jstl/Util.java | 6 +-
.../tomcat/util/net/NioBlockingSelector.java | 10 ++-
.../apache/tomcat/util/net/NioSelectorPool.java | 10 ++-
21 files changed, 290 insertions(+), 119 deletions(-)
diff --git a/java/javax/servlet/http/HttpServlet.java
b/java/javax/servlet/http/HttpServlet.java
index 7cc00bc..49d77e8 100644
--- a/java/javax/servlet/http/HttpServlet.java
+++ b/java/javax/servlet/http/HttpServlet.java
@@ -501,35 +501,63 @@ public abstract class HttpServlet extends GenericServlet {
ALLOW_GET = true;
ALLOW_HEAD = true;
}
- if (m.getName().equals("doPost"))
+ if (m.getName().equals("doPost")) {
ALLOW_POST = true;
- if (m.getName().equals("doPut"))
+ }
+ if (m.getName().equals("doPut")) {
ALLOW_PUT = true;
- if (m.getName().equals("doDelete"))
+ }
+ if (m.getName().equals("doDelete")) {
ALLOW_DELETE = true;
+ }
}
String allow = null;
- if (ALLOW_GET)
+ if (ALLOW_GET) {
allow=METHOD_GET;
- if (ALLOW_HEAD)
- if (allow==null) allow=METHOD_HEAD;
- else allow += ", " + METHOD_HEAD;
- if (ALLOW_POST)
- if (allow==null) allow=METHOD_POST;
- else allow += ", " + METHOD_POST;
- if (ALLOW_PUT)
- if (allow==null) allow=METHOD_PUT;
- else allow += ", " + METHOD_PUT;
- if (ALLOW_DELETE)
- if (allow==null) allow=METHOD_DELETE;
- else allow += ", " + METHOD_DELETE;
- if (ALLOW_TRACE)
- if (allow==null) allow=METHOD_TRACE;
- else allow += ", " + METHOD_TRACE;
- if (ALLOW_OPTIONS)
- if (allow==null) allow=METHOD_OPTIONS;
- else allow += ", " + METHOD_OPTIONS;
+ }
+ if (ALLOW_HEAD) {
+ if (allow==null) {
+ allow=METHOD_HEAD;
+ } else {
+ allow += ", " + METHOD_HEAD;
+ }
+ }
+ if (ALLOW_POST) {
+ if (allow==null) {
+ allow=METHOD_POST;
+ } else {
+ allow += ", " + METHOD_POST;
+ }
+ }
+ if (ALLOW_PUT) {
+ if (allow==null) {
+ allow=METHOD_PUT;
+ } else {
+ allow += ", " + METHOD_PUT;
+ }
+ }
+ if (ALLOW_DELETE) {
+ if (allow==null) {
+ allow=METHOD_DELETE;
+ } else {
+ allow += ", " + METHOD_DELETE;
+ }
+ }
+ if (ALLOW_TRACE) {
+ if (allow==null) {
+ allow=METHOD_TRACE;
+ } else {
+ allow += ", " + METHOD_TRACE;
+ }
+ }
+ if (ALLOW_OPTIONS) {
+ if (allow==null) {
+ allow=METHOD_OPTIONS;
+ } else {
+ allow += ", " + METHOD_OPTIONS;
+ }
+ }
resp.setHeader("Allow", allow);
}
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 17b912e..b8fc59d 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -539,7 +539,9 @@ public class DeltaManager extends ClusterManagerBase{
protected void changeSessionId(Session session, boolean notify) {
String orgSessionID = session.getId();
super.changeSessionId(session);
- if (notify) sendChangeSessionId(session.getId(), orgSessionID);
+ if (notify) {
+ sendChangeSessionId(session.getId(), orgSessionID);
+ }
}
protected String rotateSessionId(Session session, boolean notify) {
diff --git a/java/org/apache/catalina/ha/session/DeltaSession.java
b/java/org/apache/catalina/ha/session/DeltaSession.java
index 58d665c..efc31a7 100644
--- a/java/org/apache/catalina/ha/session/DeltaSession.java
+++ b/java/org/apache/catalina/ha/session/DeltaSession.java
@@ -1039,7 +1039,11 @@ public class DeltaSession extends StandardSession
implements Externalizable,Clus
}
protected void setAccessCount(int count) {
- if ( accessCount == null && ACTIVITY_CHECK ) accessCount = new
AtomicInteger();
- if ( accessCount != null ) super.accessCount.set(count);
+ if ( accessCount == null && ACTIVITY_CHECK ) {
+ accessCount = new AtomicInteger();
+ }
+ if ( accessCount != null ) {
+ super.accessCount.set(count);
+ }
}
}
diff --git a/java/org/apache/catalina/loader/WebappLoader.java
b/java/org/apache/catalina/loader/WebappLoader.java
index b6d0aed..3ac2dae 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -497,8 +497,9 @@ public class WebappLoader extends LifecycleMBeanBase
public void propertyChange(PropertyChangeEvent event) {
// Validate the source of this event
- if (!(event.getSource() instanceof Context))
+ if (!(event.getSource() instanceof Context)) {
return;
+ }
// Process a relevant property change
if (event.getPropertyName().equals("reloadable")) {
diff --git a/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
b/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
index 4256fb3..57167db 100644
--- a/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
@@ -586,18 +586,23 @@ public class JmxRemoteLifecycleListener extends
SSLHostConfig implements Lifecyc
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj) {
return true;
- if (!super.equals(obj))
+ }
+ if (!super.equals(obj)) {
return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
return false;
+ }
SslRmiServerBindSocketFactory other =
(SslRmiServerBindSocketFactory) obj;
if (bindAddress == null) {
- if (other.bindAddress != null)
+ if (other.bindAddress != null) {
return false;
- } else if (!bindAddress.equals(other.bindAddress))
+ }
+ } else if (!bindAddress.equals(other.bindAddress)) {
return false;
+ }
return true;
}
}
diff --git a/java/org/apache/catalina/realm/JDBCRealm.java
b/java/org/apache/catalina/realm/JDBCRealm.java
index 01cd54f..8d95781 100644
--- a/java/org/apache/catalina/realm/JDBCRealm.java
+++ b/java/org/apache/catalina/realm/JDBCRealm.java
@@ -334,8 +334,9 @@ public class JDBCRealm
containerLog.error(sm.getString("jdbcRealm.exception"), e);
// Close the connection so that it gets reopened next time
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
}
@@ -371,9 +372,10 @@ public class JDBCRealm
// No user or no credentials
// Can't possibly authenticate, don't bother the database then
if (username == null || credentials == null) {
- if (containerLog.isTraceEnabled())
+ if (containerLog.isTraceEnabled()) {
containerLog.trace(sm.getString("jdbcRealm.authenticateFailure",
username));
+ }
return null;
}
@@ -385,9 +387,10 @@ public class JDBCRealm
// Waste a bit of time as not to reveal that the user does not
exist.
getCredentialHandler().mutate(credentials);
- if (containerLog.isTraceEnabled())
+ if (containerLog.isTraceEnabled()) {
containerLog.trace(sm.getString("jdbcRealm.authenticateFailure",
username));
+ }
return null;
}
@@ -395,13 +398,15 @@ public class JDBCRealm
boolean validated = getCredentialHandler().matches(credentials,
dbCredentials);
if (validated) {
- if (containerLog.isTraceEnabled())
+ if (containerLog.isTraceEnabled()) {
containerLog.trace(sm.getString("jdbcRealm.authenticateSuccess",
username));
+ }
} else {
- if (containerLog.isTraceEnabled())
+ if (containerLog.isTraceEnabled()) {
containerLog.trace(sm.getString("jdbcRealm.authenticateFailure",
username));
+ }
return null;
}
@@ -426,8 +431,9 @@ public class JDBCRealm
protected void close(Connection dbConnection) {
// Do nothing if the database connection is already closed
- if (dbConnection == null)
+ if (dbConnection == null) {
return;
+ }
// Close our prepared statements (if any)
try {
@@ -615,8 +621,9 @@ public class JDBCRealm
containerLog.error(sm.getString("jdbcRealm.exception"), e);
// Close the connection so that it gets reopened next time
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
}
numberOfTries--;
@@ -635,8 +642,9 @@ public class JDBCRealm
protected Connection open() throws SQLException {
// Do nothing if there is a database connection already open
- if (dbConnection != null)
+ if (dbConnection != null) {
return dbConnection;
+ }
// Instantiate our database driver if necessary
if (driver == null) {
@@ -651,10 +659,12 @@ public class JDBCRealm
// Open a new connection
Properties props = new Properties();
- if (connectionName != null)
+ if (connectionName != null) {
props.put("user", connectionName);
- if (connectionPassword != null)
+ }
+ if (connectionPassword != null) {
props.put("password", connectionPassword);
+ }
dbConnection = driver.connect(connectionURL, props);
if (dbConnection == null) {
throw new SQLException(sm.getString(
diff --git a/java/org/apache/catalina/session/JDBCStore.java
b/java/org/apache/catalina/session/JDBCStore.java
index 0af256c..b658fb0 100644
--- a/java/org/apache/catalina/session/JDBCStore.java
+++ b/java/org/apache/catalina/session/JDBCStore.java
@@ -543,8 +543,9 @@ public class JDBCStore extends StoreBase {
manager.getContext().getLogger().error(sm.getString(getStoreName() +
".SQLException", e));
keys = new String[0];
// Close the connection so that it gets reopened next time
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
} finally {
release(_conn);
}
@@ -594,8 +595,9 @@ public class JDBCStore extends StoreBase {
}
} catch (SQLException e) {
manager.getContext().getLogger().error(sm.getString(getStoreName() +
".SQLException", e));
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
} finally {
release(_conn);
}
@@ -662,8 +664,9 @@ public class JDBCStore extends StoreBase {
}
} catch (SQLException e) {
contextLog.error(sm.getString(getStoreName() +
".SQLException", e));
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
} finally {
context.unbind(Globals.IS_SECURITY_ENABLED,
oldThreadContextCL);
release(_conn);
@@ -702,8 +705,9 @@ public class JDBCStore extends StoreBase {
numberOfTries = 0;
} catch (SQLException e) {
manager.getContext().getLogger().error(sm.getString(getStoreName() +
".SQLException", e));
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
} finally {
release(_conn);
}
@@ -767,8 +771,9 @@ public class JDBCStore extends StoreBase {
numberOfTries = 0;
} catch (SQLException e) {
manager.getContext().getLogger().error(sm.getString(getStoreName() +
".SQLException", e));
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
} finally {
release(_conn);
}
@@ -832,8 +837,9 @@ public class JDBCStore extends StoreBase {
}
} catch (SQLException e) {
manager.getContext().getLogger().error(sm.getString(getStoreName() +
".SQLException", e));
- if (dbConnection != null)
+ if (dbConnection != null) {
close(dbConnection);
+ }
} catch (IOException e) {
// Ignore
} finally {
@@ -889,8 +895,9 @@ public class JDBCStore extends StoreBase {
protected Connection open() throws SQLException {
// Do nothing if there is a database connection already open
- if (dbConnection != null)
+ if (dbConnection != null) {
return dbConnection;
+ }
if (dataSourceName != null && dataSource == null) {
org.apache.catalina.Context context = getManager().getContext();
@@ -934,10 +941,12 @@ public class JDBCStore extends StoreBase {
// Open a new connection
Properties props = new Properties();
- if (connectionName != null)
+ if (connectionName != null) {
props.put("user", connectionName);
- if (connectionPassword != null)
+ }
+ if (connectionPassword != null) {
props.put("password", connectionPassword);
+ }
dbConnection = driver.connect(connectionURL, props);
if (dbConnection == null) {
throw new SQLException(sm.getString(getStoreName() +
".connectError", connectionURL));
@@ -955,8 +964,9 @@ public class JDBCStore extends StoreBase {
protected void close(Connection dbConnection) {
// Do nothing if the database connection is already closed
- if (dbConnection == null)
+ if (dbConnection == null) {
return;
+ }
// Close our prepared statements (if any)
try {
diff --git a/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
b/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
index 57bc227..e5fa2aa 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
@@ -38,9 +38,14 @@ class BufferPool15Impl implements BufferPool.BufferPoolAPI {
@Override
public XByteBuffer getBuffer(int minSize, boolean discard) {
XByteBuffer buffer = queue.poll();
- if ( buffer != null ) size.addAndGet(-buffer.getCapacity());
- if ( buffer == null ) buffer = new XByteBuffer(minSize,discard);
- else if ( buffer.getCapacity() <= minSize ) buffer.expand(minSize);
+ if ( buffer != null ) {
+ size.addAndGet(-buffer.getCapacity());
+ }
+ if ( buffer == null ) {
+ buffer = new XByteBuffer(minSize,discard);
+ } else if ( buffer.getCapacity() <= minSize ) {
+ buffer.expand(minSize);
+ }
buffer.setDiscard(discard);
buffer.reset();
return buffer;
diff --git a/java/org/apache/catalina/tribes/membership/MemberImpl.java
b/java/org/apache/catalina/tribes/membership/MemberImpl.java
index 5734c3d..e102bac 100644
--- a/java/org/apache/catalina/tribes/membership/MemberImpl.java
+++ b/java/org/apache/catalina/tribes/membership/MemberImpl.java
@@ -456,14 +456,16 @@ public class MemberImpl implements Member,
java.io.Externalizable {
}
public String getHostname() {
- if ( this.hostname != null ) return hostname;
- else {
+ if ( this.hostname != null ) {
+ return hostname;
+ } else {
try {
byte[] host = this.host;
- if (DO_DNS_LOOKUPS)
+ if (DO_DNS_LOOKUPS) {
this.hostname =
java.net.InetAddress.getByAddress(host).getHostName();
- else
+ } else {
this.hostname =
org.apache.catalina.tribes.util.Arrays.toString(host,0,host.length,true);
+ }
return this.hostname;
}catch ( IOException x ) {
throw new
RuntimeException(sm.getString("memberImpl.unableParse.hostname"),x);
diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
index 6c19893..efaf6b8 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
@@ -51,21 +51,29 @@ public class BioReceiver extends ReceiverBase implements
Runnable {
setPool(new RxTaskPool(getMaxThreads(),getMinThreads(),this));
} catch (Exception x) {
log.fatal(sm.getString("bioReceiver.threadpool.fail"), x);
- if ( x instanceof IOException ) throw (IOException)x;
- else throw new IOException(x.getMessage());
+ if ( x instanceof IOException ) {
+ throw (IOException)x;
+ } else {
+ throw new IOException(x.getMessage());
+ }
}
try {
getBind();
bind();
String channelName = "";
- if (getChannel().getName() != null) channelName = "[" +
getChannel().getName() + "]";
+ if (getChannel().getName() != null) {
+ channelName = "[" + getChannel().getName() + "]";
+ }
Thread t = new Thread(this, "BioReceiver" + channelName);
t.setDaemon(true);
t.start();
} catch (Exception x) {
log.fatal(sm.getString("bioReceiver.start.fail"), x);
- if ( x instanceof IOException ) throw (IOException)x;
- else throw new IOException(x.getMessage());
+ if ( x instanceof IOException ) {
+ throw (IOException)x;
+ } else {
+ throw new IOException(x.getMessage());
+ }
}
}
@@ -123,15 +131,21 @@ public class BioReceiver extends ReceiverBase implements
Runnable {
while ( doListen() ) {
Socket socket = null;
if ( getTaskPool().available() < 1 ) {
- if ( log.isWarnEnabled() )
+ if ( log.isWarnEnabled() ) {
log.warn(sm.getString("bioReceiver.threads.busy"));
+ }
}
BioReplicationTask task =
(BioReplicationTask)getTaskPool().getRxTask();
- if ( task == null ) continue; //should never happen
+ if ( task == null )
+ {
+ continue; //should never happen
+ }
try {
socket = serverSocket.accept();
}catch ( Exception x ) {
- if ( doListen() ) throw x;
+ if ( doListen() ) {
+ throw x;
+ }
}
if ( !doListen() ) {
task.serviceSocket(null,null);
@@ -139,7 +153,9 @@ public class BioReceiver extends ReceiverBase implements
Runnable {
task.close();
break; //regular shutdown
}
- if ( socket == null ) continue;
+ if ( socket == null ) {
+ continue;
+ }
socket.setReceiveBufferSize(getRxBufSize());
socket.setSendBufferSize(getTxBufSize());
socket.setTcpNoDelay(getTcpNoDelay());
diff --git
a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
index 1453213..1d5745e 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
@@ -61,7 +61,9 @@ public class BioReplicationTask extends AbstractRxTask {
@Override
public synchronized void run()
{
- if ( socket == null ) return;
+ if ( socket == null ) {
+ return;
+ }
try {
drainSocket();
} catch ( Exception x ) {
@@ -85,7 +87,9 @@ public class BioReplicationTask extends AbstractRxTask {
socket = null;
}
// done, ready for more, return to pool
- if ( getTaskPool() != null ) getTaskPool().returnWorker (this);
+ if ( getTaskPool() != null ) {
+ getTaskPool().returnWorker (this);
+ }
}
@@ -105,7 +109,9 @@ public class BioReplicationTask extends AbstractRxTask {
* server before completing the request
* This is considered an asynchronous request
*/
- if (ChannelData.sendAckAsync(msgs[i].getOptions()))
sendAck(Constants.ACK_COMMAND);
+ if (ChannelData.sendAckAsync(msgs[i].getOptions())) {
+ sendAck(Constants.ACK_COMMAND);
+ }
try {
//process the message
getCallback().messageDataReceived(msgs[i]);
@@ -114,9 +120,13 @@ public class BioReplicationTask extends AbstractRxTask {
* server before sending the ack to the remote server
* This is considered a synchronized request
*/
- if (ChannelData.sendAckSync(msgs[i].getOptions()))
sendAck(Constants.ACK_COMMAND);
+ if (ChannelData.sendAckSync(msgs[i].getOptions())) {
+ sendAck(Constants.ACK_COMMAND);
+ }
}catch ( Exception x ) {
- if (ChannelData.sendAckSync(msgs[i].getOptions()))
sendAck(Constants.FAIL_ACK_COMMAND);
+ if (ChannelData.sendAckSync(msgs[i].getOptions())) {
+ sendAck(Constants.FAIL_ACK_COMMAND);
+ }
log.error(sm.getString("bioReplicationTask.messageDataReceived.error"),x);
}
if ( getUseBufferPool() ) {
@@ -145,7 +155,9 @@ public class BioReplicationTask extends AbstractRxTask {
int length = in.read(buf);
while ( length >= 0 ) {
int count = reader.append(buf,0,length,true);
- if ( count > 0 ) execute(reader);
+ if ( count > 0 ) {
+ execute(reader);
+ }
length = in.read(buf);
}
}
diff --git a/java/org/apache/catalina/tribes/transport/bio/BioSender.java
b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
index 18bb496..eeef6a9 100644
--- a/java/org/apache/catalina/tribes/transport/bio/BioSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioSender.java
@@ -93,8 +93,9 @@ public class BioSender extends AbstractSender {
boolean connect = isConnected();
closeSocket();
if (connect) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(sm.getString("bioSender.disconnect",
getAddress().getHostAddress(), Integer.valueOf(getPort()), Long.valueOf(0)));
+ }
}
}
@@ -114,7 +115,9 @@ public class BioSender extends AbstractSender {
} catch (IOException x) {
SenderState.getSenderState(getDestination()).setSuspect();
exception = x;
- if (log.isTraceEnabled())
log.trace(sm.getString("bioSender.send.again",
getAddress().getHostAddress(),Integer.valueOf(getPort())),x);
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("bioSender.send.again",
getAddress().getHostAddress(),Integer.valueOf(getPort())),x);
+ }
while ( getAttempt()<getMaxRetryAttempts() ) {
try {
setAttempt(getAttempt()+1);
@@ -129,7 +132,9 @@ public class BioSender extends AbstractSender {
} finally {
setRequestCount(getRequestCount()+1);
keepalive();
- if ( exception != null ) throw exception;
+ if ( exception != null ) {
+ throw exception;
+ }
}
}
@@ -150,7 +155,9 @@ public class BioSender extends AbstractSender {
* @throws IOException Error opening socket
*/
protected void openSocket() throws IOException {
- if(isConnected()) return ;
+ if(isConnected()) {
+ return ;
+ }
try {
socket = new Socket();
InetSocketAddress sockaddr = new InetSocketAddress(getAddress(),
getPort());
@@ -169,12 +176,14 @@ public class BioSender extends AbstractSender {
soIn = socket.getInputStream();
setRequestCount(0);
setConnectTime(System.currentTimeMillis());
- if (log.isDebugEnabled())
- log.debug(sm.getString("bioSender.openSocket",
getAddress().getHostAddress(), Integer.valueOf(getPort()), Long.valueOf(0)));
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("bioSender.openSocket",
getAddress().getHostAddress(), Integer.valueOf(getPort()), Long.valueOf(0)));
+ }
} catch (IOException ex1) {
SenderState.getSenderState(getDestination()).setSuspect();
- if (log.isDebugEnabled())
-
log.debug(sm.getString("bioSender.openSocket.failure",getAddress().getHostAddress(),
Integer.valueOf(getPort()), Long.valueOf(0)), ex1);
+ if (log.isDebugEnabled()) {
+
log.debug(sm.getString("bioSender.openSocket.failure",getAddress().getHostAddress(),
Integer.valueOf(getPort()), Long.valueOf(0)), ex1);
+ }
throw ex1;
}
@@ -200,8 +209,9 @@ public class BioSender extends AbstractSender {
}
setRequestCount(0);
setConnected(false);
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug(sm.getString("bioSender.closeSocket",getAddress().getHostAddress(),
Integer.valueOf(getPort()), Long.valueOf(0)));
+ }
}
}
@@ -227,11 +237,17 @@ public class BioSender extends AbstractSender {
protected void pushMessage(byte[] data, boolean reconnect, boolean
waitForAck) throws IOException {
keepalive();
- if ( reconnect ) closeSocket();
- if (!isConnected()) openSocket();
+ if ( reconnect ) {
+ closeSocket();
+ }
+ if (!isConnected()) {
+ openSocket();
+ }
soOut.write(data);
soOut.flush();
- if (waitForAck) waitForAck();
+ if (waitForAck) {
+ waitForAck();
+ }
SenderState.getSenderState(getDestination()).setReady();
}
@@ -262,8 +278,11 @@ public class BioSender extends AbstractSender {
i = soIn.read();
}
if (!ackReceived) {
- if (i == -1) throw new
IOException(sm.getString("bioSender.ack.eof",getAddress(),
Integer.valueOf(socket.getLocalPort())));
- else throw new
IOException(sm.getString("bioSender.ack.wrong",getAddress(),
Integer.valueOf(socket.getLocalPort())));
+ if (i == -1) {
+ throw new
IOException(sm.getString("bioSender.ack.eof",getAddress(),
Integer.valueOf(socket.getLocalPort())));
+ } else {
+ throw new
IOException(sm.getString("bioSender.ack.wrong",getAddress(),
Integer.valueOf(socket.getLocalPort())));
+ }
} else if ( failAckReceived && getThrowOnFailedAck()) {
throw new
RemoteProcessException(sm.getString("bioSender.fail.AckReceived"));
}
@@ -271,9 +290,13 @@ public class BioSender extends AbstractSender {
String errmsg = sm.getString("bioSender.ack.missing",
getAddress(), Integer.valueOf(socket.getLocalPort()),
Long.valueOf(getTimeout()));
if ( SenderState.getSenderState(getDestination()).isReady() ) {
SenderState.getSenderState(getDestination()).setSuspect();
- if ( log.isWarnEnabled() ) log.warn(errmsg, x);
+ if ( log.isWarnEnabled() ) {
+ log.warn(errmsg, x);
+ }
} else {
- if ( log.isDebugEnabled() )log.debug(errmsg, x);
+ if ( log.isDebugEnabled() ) {
+ log.debug(errmsg, x);
+ }
}
throw x;
} finally {
diff --git
a/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
b/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
index bcb9cdb..e27191c 100644
--- a/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
@@ -50,11 +50,15 @@ public class MultipointBioSender extends AbstractSender
implements MultiPointSen
try {
senders[i].sendMessage(data,(msg.getOptions()&Channel.SEND_OPTIONS_USE_ACK)==Channel.SEND_OPTIONS_USE_ACK);
} catch (Exception x) {
- if (cx == null) cx = new ChannelException(x);
+ if (cx == null) {
+ cx = new ChannelException(x);
+ }
cx.addFaultyMember(destination[i],x);
}
}
- if (cx!=null ) throw cx;
+ if (cx!=null ) {
+ throw cx;
+ }
}
@@ -72,15 +76,22 @@ public class MultipointBioSender extends AbstractSender
implements MultiPointSen
bioSenders.put(destination[i], sender);
}
result[i] = sender;
- if (!result[i].isConnected() ) result[i].connect();
+ if (!result[i].isConnected() ) {
+ result[i].connect();
+ }
result[i].keepalive();
}catch (Exception x ) {
- if ( cx== null ) cx = new ChannelException(x);
+ if ( cx== null ) {
+ cx = new ChannelException(x);
+ }
cx.addFaultyMember(destination[i],x);
}
}
- if ( cx!=null ) throw cx;
- else return result;
+ if ( cx!=null ) {
+ throw cx;
+ } else {
+ return result;
+ }
}
@Override
@@ -99,12 +110,16 @@ public class MultipointBioSender extends AbstractSender
implements MultiPointSen
BioSender sender = bioSenders.get(mbr);
sender.disconnect();
}catch ( Exception e ) {
- if ( x == null ) x = new ChannelException(e);
+ if ( x == null ) {
+ x = new ChannelException(e);
+ }
x.addFaultyMember(mbr,e);
}
bioSenders.remove(mbr);
}
- if ( x != null ) throw x;
+ if ( x != null ) {
+ throw x;
+ }
}
@Override
@@ -118,7 +133,9 @@ public class MultipointBioSender extends AbstractSender
implements MultiPointSen
public void remove(Member member) {
//disconnect senders
BioSender sender = bioSenders.remove(member);
- if ( sender != null ) sender.disconnect();
+ if ( sender != null ) {
+ sender.disconnect();
+ }
}
diff --git
a/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
b/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
index 1ba52e1..d0767f4 100644
--- a/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
+++ b/java/org/apache/catalina/tribes/transport/bio/PooledMultiSender.java
@@ -45,15 +45,18 @@ public class PooledMultiSender extends PooledSender {
if (sender == null) {
ChannelException cx = new ChannelException(sm.getString(
"pooledMultiSender.unable.retrieve.sender",
Long.toString(getMaxWait())));
- for (int i = 0; i < destination.length; i++)
+ for (int i = 0; i < destination.length; i++) {
cx.addFaultyMember(destination[i], new
NullPointerException(sm.getString("pooledMultiSender.retrieve.fail")));
+ }
throw cx;
} else {
sender.sendMessage(destination, msg);
}
sender.keepalive();
}finally {
- if ( sender != null ) returnSender(sender);
+ if ( sender != null ) {
+ returnSender(sender);
+ }
}
}
diff --git a/java/org/apache/coyote/RequestInfo.java
b/java/org/apache/coyote/RequestInfo.java
index 629ca0f..1e67d40 100644
--- a/java/org/apache/coyote/RequestInfo.java
+++ b/java/org/apache/coyote/RequestInfo.java
@@ -166,8 +166,9 @@ public class RequestInfo {
bytesSent+=req.getResponse().getContentWritten();
requestCount++;
- if( req.getResponse().getStatus() >=400 )
+ if( req.getResponse().getStatus() >=400 ) {
errorCount++;
+ }
long t0=req.getStartTime();
long t1=System.currentTimeMillis();
long time=t1-t0;
diff --git a/java/org/apache/el/lang/ELSupport.java
b/java/org/apache/el/lang/ELSupport.java
index a81c6a1..e47d3e8 100644
--- a/java/org/apache/el/lang/ELSupport.java
+++ b/java/org/apache/el/lang/ELSupport.java
@@ -532,8 +532,9 @@ public class ELSupport {
}
// new to spec
- if (obj == null)
+ if (obj == null) {
return null;
+ }
if (obj instanceof String) {
String str = (String) obj;
PropertyEditor editor = PropertyEditorManager.findEditor(type);
diff --git a/java/org/apache/jasper/el/JspValueExpression.java
b/java/org/apache/jasper/el/JspValueExpression.java
index 6030c18..61a426c 100644
--- a/java/org/apache/jasper/el/JspValueExpression.java
+++ b/java/org/apache/jasper/el/JspValueExpression.java
@@ -62,10 +62,14 @@ public final class JspValueExpression extends
ValueExpression implements
context.notifyAfterEvaluation(getExpressionString());
return result;
} catch (PropertyNotFoundException e) {
- if (e instanceof JspPropertyNotFoundException) throw e;
+ if (e instanceof JspPropertyNotFoundException) {
+ throw e;
+ }
throw new JspPropertyNotFoundException(this.mark, e);
} catch (ELException e) {
- if (e instanceof JspELException) throw e;
+ if (e instanceof JspELException) {
+ throw e;
+ }
throw new JspELException(this.mark, e);
}
}
@@ -79,10 +83,14 @@ public final class JspValueExpression extends
ValueExpression implements
context.notifyAfterEvaluation(getExpressionString());
return result;
} catch (PropertyNotFoundException e) {
- if (e instanceof JspPropertyNotFoundException) throw e;
+ if (e instanceof JspPropertyNotFoundException) {
+ throw e;
+ }
throw new JspPropertyNotFoundException(this.mark, e);
} catch (ELException e) {
- if (e instanceof JspELException) throw e;
+ if (e instanceof JspELException) {
+ throw e;
+ }
throw new JspELException(this.mark, e);
}
}
@@ -96,13 +104,19 @@ public final class JspValueExpression extends
ValueExpression implements
this.target.setValue(context, value);
context.notifyAfterEvaluation(getExpressionString());
} catch (PropertyNotWritableException e) {
- if (e instanceof JspPropertyNotWritableException) throw e;
+ if (e instanceof JspPropertyNotWritableException) {
+ throw e;
+ }
throw new JspPropertyNotWritableException(this.mark, e);
} catch (PropertyNotFoundException e) {
- if (e instanceof JspPropertyNotFoundException) throw e;
+ if (e instanceof JspPropertyNotFoundException) {
+ throw e;
+ }
throw new JspPropertyNotFoundException(this.mark, e);
} catch (ELException e) {
- if (e instanceof JspELException) throw e;
+ if (e instanceof JspELException) {
+ throw e;
+ }
throw new JspELException(this.mark, e);
}
}
@@ -116,10 +130,14 @@ public final class JspValueExpression extends
ValueExpression implements
context.notifyAfterEvaluation(getExpressionString());
return result;
} catch (PropertyNotFoundException e) {
- if (e instanceof JspPropertyNotFoundException) throw e;
+ if (e instanceof JspPropertyNotFoundException) {
+ throw e;
+ }
throw new JspPropertyNotFoundException(this.mark, e);
} catch (ELException e) {
- if (e instanceof JspELException) throw e;
+ if (e instanceof JspELException) {
+ throw e;
+ }
throw new JspELException(this.mark, e);
}
}
diff --git a/java/org/apache/jasper/runtime/JspContextWrapper.java
b/java/org/apache/jasper/runtime/JspContextWrapper.java
index f969851..ccccd35 100644
--- a/java/org/apache/jasper/runtime/JspContextWrapper.java
+++ b/java/org/apache/jasper/runtime/JspContextWrapper.java
@@ -496,8 +496,9 @@ public class JspContextWrapper extends PageContext
implements VariableResolver {
*/
private String findAlias(String varName) {
- if (aliases == null)
+ if (aliases == null) {
return varName;
+ }
String alias = aliases.get(varName);
if (alias == null) {
diff --git a/java/org/apache/jasper/tagplugins/jstl/Util.java
b/java/org/apache/jasper/tagplugins/jstl/Util.java
index a8d0b27..61eb792 100644
--- a/java/org/apache/jasper/tagplugins/jstl/Util.java
+++ b/java/org/apache/jasper/tagplugins/jstl/Util.java
@@ -174,10 +174,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();
diff --git a/java/org/apache/tomcat/util/net/NioBlockingSelector.java
b/java/org/apache/tomcat/util/net/NioBlockingSelector.java
index 79f0797..1499139 100644
--- a/java/org/apache/tomcat/util/net/NioBlockingSelector.java
+++ b/java/org/apache/tomcat/util/net/NioBlockingSelector.java
@@ -250,7 +250,9 @@ public class NioBlockingSelector {
}
public void wakeup() {
- if (wakeupCounter.addAndGet(1)==0) selector.wakeup();
+ if (wakeupCounter.addAndGet(1)==0) {
+ selector.wakeup();
+ }
}
public void cancel(SelectionKey sk, NioSocketWrapper key, int ops){
@@ -391,15 +393,17 @@ public class NioBlockingSelector {
// Cancels all remaining keys
selector.selectNow();
} catch (Exception ignore) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("", ignore);
+ }
}
}
try {
selector.close();
} catch (Exception ignore) {
- if (log.isDebugEnabled())
+ if (log.isDebugEnabled()) {
log.debug("", ignore);
+ }
}
}
diff --git a/java/org/apache/tomcat/util/net/NioSelectorPool.java
b/java/org/apache/tomcat/util/net/NioSelectorPool.java
index c557f06..e02c14a 100644
--- a/java/org/apache/tomcat/util/net/NioSelectorPool.java
+++ b/java/org/apache/tomcat/util/net/NioSelectorPool.java
@@ -213,7 +213,10 @@ public class NioSelectorPool {
} finally {
if (key != null) {
key.cancel();
- if (selector != null) selector.selectNow();//removes the key
from this selector
+ if (selector != null)
+ {
+ selector.selectNow();//removes the key from this selector
+ }
}
}
return written;
@@ -254,7 +257,10 @@ public class NioSelectorPool {
break;
}
read += cnt;
- if (cnt > 0) continue; //read some more
+ if (cnt > 0)
+ {
+ continue; //read some more
+ }
if (cnt == 0 && read > 0) {
break; //we are done reading
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
