This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new d89944195e Consistent naming for exception variables.
d89944195e is described below
commit d89944195e628835dc5d62b83710da2a820224fe
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Aug 19 18:37:14 2025 +0100
Consistent naming for exception variables.
"} catch (Exception <any>) {"
should now be
"} catch (Exception e) {"
apart from a handful of special cases.
---
.../catalina/core/ApplicationFilterConfig.java | 8 +-
java/org/apache/catalina/core/StandardContext.java | 8 +-
.../catalina/ha/backend/HeartbeatListener.java | 16 ++--
.../catalina/ha/backend/MultiCastSender.java | 8 +-
java/org/apache/catalina/ha/backend/TcpSender.java | 8 +-
.../catalina/ha/context/ReplicatedContext.java | 6 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 20 ++---
.../apache/catalina/ha/session/BackupManager.java | 6 +-
.../apache/catalina/ha/session/DeltaManager.java | 12 +--
.../apache/catalina/ha/session/DeltaRequest.java | 12 +--
.../apache/catalina/ha/tcp/ReplicationValve.java | 8 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 26 +++----
.../apache/catalina/manager/JMXProxyServlet.java | 24 +++---
.../storeconfig/StoreConfigLifecycleListener.java | 4 +-
.../catalina/tribes/group/ChannelCoordinator.java | 8 +-
.../apache/catalina/tribes/group/GroupChannel.java | 14 ++--
.../apache/catalina/tribes/group/RpcChannel.java | 6 +-
.../interceptors/FragmentationInterceptor.java | 4 +-
.../interceptors/MessageDispatchInterceptor.java | 14 ++--
.../group/interceptors/NonBlockingCoordinator.java | 8 +-
.../group/interceptors/TcpFailureDetector.java | 8 +-
.../group/interceptors/TcpPingInterceptor.java | 4 +-
.../interceptors/TwoPhaseCommitInterceptor.java | 4 +-
.../catalina/tribes/io/ReplicationStream.java | 2 +-
.../catalina/tribes/membership/McastService.java | 24 +++---
.../tribes/membership/McastServiceImpl.java | 26 +++----
.../membership/StaticMembershipProvider.java | 4 +-
.../tribes/tipis/AbstractReplicatedMap.java | 16 ++--
.../catalina/tribes/transport/nio/NioReceiver.java | 32 ++++----
.../tribes/transport/nio/NioReplicationTask.java | 4 +-
.../catalina/tribes/transport/nio/NioSender.java | 14 ++--
.../tribes/transport/nio/ParallelNioSender.java | 42 +++++------
.../apache/catalina/users/MemoryUserDatabase.java | 4 +-
.../apache/catalina/valves/PersistentValve.java | 2 +-
java/org/apache/jasper/JspC.java | 2 +-
java/org/apache/jasper/JspCompilationContext.java | 8 +-
java/org/apache/jasper/compiler/JspReader.java | 4 +-
java/org/apache/jasper/compiler/Parser.java | 4 +-
.../apache/jasper/compiler/TagLibraryInfoImpl.java | 4 +-
java/org/apache/jasper/el/JasperELResolver.java | 8 +-
.../apache/jasper/runtime/JspRuntimeLibrary.java | 88 +++++++++++-----------
java/org/apache/jasper/runtime/TagHandlerPool.java | 2 +-
.../apache/jasper/servlet/JspServletWrapper.java | 14 ++--
.../apache/jasper/tagplugins/jstl/core/Import.java | 5 +-
.../naming/factory/DataSourceLinkFactory.java | 16 ++--
.../apache/tomcat/util/modeler/BaseModelMBean.java | 4 +-
java/org/apache/tomcat/util/modeler/Registry.java | 8 +-
.../MbeansDescriptorsIntrospectionSource.java | 8 +-
.../apache/tomcat/util/net/AbstractEndpoint.java | 4 +-
java/org/apache/tomcat/util/net/Acceptor.java | 4 +-
java/org/apache/tomcat/util/net/NioEndpoint.java | 4 +-
java/org/apache/tomcat/util/net/SSLUtilBase.java | 6 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 4 +-
.../apache/tomcat/util/net/jsse/JSSESupport.java | 4 +-
54 files changed, 303 insertions(+), 304 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java
b/java/org/apache/catalina/core/ApplicationFilterConfig.java
index bd053b4911..f493b581a0 100644
--- a/java/org/apache/catalina/core/ApplicationFilterConfig.java
+++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java
@@ -309,8 +309,8 @@ public final class ApplicationFilterConfig implements
FilterConfig, Serializable
try {
oname = new ObjectName(onameStr);
Registry.getRegistry(null).registerComponent(this, oname, null);
- } catch (Exception ex) {
- log.warn(sm.getString("applicationFilterConfig.jmxRegisterFail",
getFilterClass(), getFilterName()), ex);
+ } catch (Exception e) {
+ log.warn(sm.getString("applicationFilterConfig.jmxRegisterFail",
getFilterClass(), getFilterName()), e);
}
}
@@ -323,9 +323,9 @@ public final class ApplicationFilterConfig implements
FilterConfig, Serializable
if (log.isDebugEnabled()) {
log.debug(sm.getString("applicationFilterConfig.jmxUnregister",
getFilterClass(), getFilterName()));
}
- } catch (Exception ex) {
+ } catch (Exception e) {
log.warn(sm.getString("applicationFilterConfig.jmxUnregisterFail",
getFilterClass(), getFilterName()),
- ex);
+ e);
}
}
}
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 3232d6fa39..b7d3730e43 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -4369,8 +4369,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
if ((getCluster() != null) && distributable) {
try {
contextManager =
getCluster().createManager(getName());
- } catch (Exception ex) {
-
log.error(sm.getString("standardContext.cluster.managerError"), ex);
+ } catch (Exception e) {
+
log.error(sm.getString("standardContext.cluster.managerError"), e);
ok = false;
}
} else {
@@ -4727,8 +4727,8 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
// This object will no longer be visible or used.
try {
resetContext();
- } catch (Exception ex) {
- log.error(sm.getString("standardContext.resetContextFail",
getName()), ex);
+ } catch (Exception e) {
+ log.error(sm.getString("standardContext.resetContextFail",
getName()), e);
}
// reset the instance manager
diff --git a/java/org/apache/catalina/ha/backend/HeartbeatListener.java
b/java/org/apache/catalina/ha/backend/HeartbeatListener.java
index 3e16ff05c1..e132e74dce 100644
--- a/java/org/apache/catalina/ha/backend/HeartbeatListener.java
+++ b/java/org/apache/catalina/ha/backend/HeartbeatListener.java
@@ -199,8 +199,8 @@ public class HeartbeatListener implements LifecycleListener
{
coll = new CollectedInfo(host, port);
this.port = coll.port;
this.host = coll.host;
- } catch (Exception ex) {
-
log.error(sm.getString("heartbeatListener.errorCollectingInfo"), ex);
+ } catch (Exception e) {
+
log.error(sm.getString("heartbeatListener.errorCollectingInfo"), e);
coll = null;
return;
}
@@ -209,8 +209,8 @@ public class HeartbeatListener implements LifecycleListener
{
/* Start or restart sender */
try {
sender.init(this);
- } catch (Exception ex) {
- log.error(sm.getString("heartbeatListener.senderInitError"),
ex);
+ } catch (Exception e) {
+ log.error(sm.getString("heartbeatListener.senderInitError"),
e);
sender = null;
return;
}
@@ -218,16 +218,16 @@ public class HeartbeatListener implements
LifecycleListener {
/* refresh the connector information and send it */
try {
coll.refresh();
- } catch (Exception ex) {
- log.error(sm.getString("heartbeatListener.refreshError"), ex);
+ } catch (Exception e) {
+ log.error(sm.getString("heartbeatListener.refreshError"), e);
coll = null;
return;
}
String output = "v=1&ready=" + coll.ready + "&busy=" + coll.busy +
"&port=" + port;
try {
sender.send(output);
- } catch (Exception ex) {
- log.error(sm.getString("heartbeatListener.sendError"), ex);
+ } catch (Exception e) {
+ log.error(sm.getString("heartbeatListener.sendError"), e);
}
}
}
diff --git a/java/org/apache/catalina/ha/backend/MultiCastSender.java
b/java/org/apache/catalina/ha/backend/MultiCastSender.java
index b778d3a655..6f51dc3091 100644
--- a/java/org/apache/catalina/ha/backend/MultiCastSender.java
+++ b/java/org/apache/catalina/ha/backend/MultiCastSender.java
@@ -60,8 +60,8 @@ public class MultiCastSender implements Sender {
s.setTimeToLive(config.getTtl());
s.joinGroup(new InetSocketAddress(group, 0), null);
- } catch (Exception ex) {
- log.error(sm.getString("multiCastSender.multiCastFailed"), ex);
+ } catch (Exception e) {
+ log.error(sm.getString("multiCastSender.multiCastFailed"), e);
s = null;
return -1;
}
@@ -72,8 +72,8 @@ public class MultiCastSender implements Sender {
DatagramPacket data = new DatagramPacket(buf, buf.length, group,
config.getMultiport());
try {
s.send(data);
- } catch (Exception ex) {
- log.error(sm.getString("multiCastSender.sendFailed"), ex);
+ } catch (Exception e) {
+ log.error(sm.getString("multiCastSender.sendFailed"), e);
s.close();
s = null;
return -1;
diff --git a/java/org/apache/catalina/ha/backend/TcpSender.java
b/java/org/apache/catalina/ha/backend/TcpSender.java
index 543cfcb674..f56dacb999 100644
--- a/java/org/apache/catalina/ha/backend/TcpSender.java
+++ b/java/org/apache/catalina/ha/backend/TcpSender.java
@@ -106,8 +106,8 @@ public class TcpSender implements Sender {
}
connectionReaders[i] = new BufferedReader(new
InputStreamReader(connections[i].getInputStream()));
connectionWriters[i] = new BufferedWriter(new
OutputStreamWriter(connections[i].getOutputStream()));
- } catch (Exception ex) {
- log.error(sm.getString("tcpSender.connectionFailed"), ex);
+ } catch (Exception e) {
+ log.error(sm.getString("tcpSender.connectionFailed"), e);
close(i);
}
}
@@ -125,8 +125,8 @@ public class TcpSender implements Sender {
writer.write(mess);
writer.write("\r\n");
writer.flush();
- } catch (Exception ex) {
- log.error(sm.getString("tcpSender.sendFailed"), ex);
+ } catch (Exception e) {
+ log.error(sm.getString("tcpSender.sendFailed"), e);
close(i);
}
if (connections[i] == null) {
diff --git a/java/org/apache/catalina/ha/context/ReplicatedContext.java
b/java/org/apache/catalina/ha/context/ReplicatedContext.java
index d1ea1565e3..5ba2583fb0 100644
--- a/java/org/apache/catalina/ha/context/ReplicatedContext.java
+++ b/java/org/apache/catalina/ha/context/ReplicatedContext.java
@@ -62,9 +62,9 @@ public class ReplicatedContext extends StandardContext
implements MapOwner {
map.setChannelSendOptions(mapSendOptions);
((ReplApplContext) this.context).setAttributeMap(map);
}
- } catch (Exception x) {
- log.error(sm.getString("replicatedContext.startUnable",
getName()), x);
- throw new
LifecycleException(sm.getString("replicatedContext.startFailed", getName()), x);
+ } catch (Exception e) {
+ log.error(sm.getString("replicatedContext.startUnable",
getName()), e);
+ throw new
LifecycleException(sm.getString("replicatedContext.startFailed", getName()), e);
}
}
diff --git a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
index 09a312b6a8..ece480721d 100644
--- a/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
+++ b/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
@@ -237,8 +237,8 @@ public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer,
} else {
log.error(sm.getString("farmWarDeployer.servicingDeploy", contextName, name));
}
- } catch (Exception ex) {
-
log.error(sm.getString("farmWarDeployer.fileMessageError"), ex);
+ } catch (Exception e) {
+
log.error(sm.getString("farmWarDeployer.fileMessageError"), e);
} finally {
removeFactory(fmsg);
}
@@ -262,8 +262,8 @@ public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer,
} else {
log.error(sm.getString("farmWarDeployer.servicingUndeploy", contextName));
}
- } catch (Exception ex) {
-
log.error(sm.getString("farmWarDeployer.undeployMessageError"), ex);
+ } catch (Exception e) {
+
log.error(sm.getString("farmWarDeployer.undeployMessageError"), e);
}
}
} catch (IOException x) {
@@ -395,8 +395,8 @@ public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer,
log.error(sm.getString("farmWarDeployer.removeFailRemote",
contextName));
}
- } catch (Exception ex) {
- log.error(sm.getString("farmWarDeployer.removeFailLocal",
contextName), ex);
+ } catch (Exception e) {
+ log.error(sm.getString("farmWarDeployer.removeFailLocal",
contextName), e);
}
}
@@ -428,8 +428,8 @@ public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer,
log.error(sm.getString("farmWarDeployer.servicingDeploy",
cn.getName(), deployWar.getName()));
}
install(cn.getName(), deployWar);
- } catch (Exception x) {
- log.error(sm.getString("farmWarDeployer.modInstallFail"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("farmWarDeployer.modInstallFail"), e);
}
}
@@ -441,8 +441,8 @@ public class FarmWarDeployer extends ClusterListener
implements ClusterDeployer,
log.info(sm.getString("farmWarDeployer.removeLocal",
cn.getName()));
}
remove(cn.getName(), true);
- } catch (Exception x) {
- log.error(sm.getString("farmWarDeployer.removeLocalFail"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("farmWarDeployer.removeLocalFail"), e);
}
}
diff --git a/java/org/apache/catalina/ha/session/BackupManager.java
b/java/org/apache/catalina/ha/session/BackupManager.java
index 4943de2424..0215b09f96 100644
--- a/java/org/apache/catalina/ha/session/BackupManager.java
+++ b/java/org/apache/catalina/ha/session/BackupManager.java
@@ -141,9 +141,9 @@ public class BackupManager extends ClusterManagerBase
implements MapOwner, Distr
map.setChannelSendOptions(mapSendOptions);
map.setAccessTimeout(accessTimeout);
this.sessions = map;
- } catch (Exception x) {
- log.error(sm.getString("backupManager.startUnable", getName()), x);
- throw new
LifecycleException(sm.getString("backupManager.startFailed", getName()), x);
+ } catch (Exception e) {
+ log.error(sm.getString("backupManager.startUnable", getName()), e);
+ throw new
LifecycleException(sm.getString("backupManager.startFailed", getName()), e);
}
setState(LifecycleState.STARTING);
}
diff --git a/java/org/apache/catalina/ha/session/DeltaManager.java
b/java/org/apache/catalina/ha/session/DeltaManager.java
index 53df6acc43..7630e3b1d4 100644
--- a/java/org/apache/catalina/ha/session/DeltaManager.java
+++ b/java/org/apache/catalina/ha/session/DeltaManager.java
@@ -788,8 +788,8 @@ public class DeltaManager extends ClusterManagerBase {
do {
try {
Thread.sleep(100);
- } catch (Exception sleep) {
- //
+ } catch (Exception ignore) {
+ // Ignore
}
reqNow = System.currentTimeMillis();
isTimeout = ((reqNow - reqStart) > (1000L *
getStateTransferTimeout()));
@@ -800,7 +800,7 @@ public class DeltaManager extends ClusterManagerBase {
do {
try {
Thread.sleep(100);
- } catch (Exception sleep) {
+ } catch (Exception ignore) {
// Ignore
}
} while ((!getStateTransferred()) &&
(!isNoContextManagerReceived()));
@@ -1125,8 +1125,8 @@ public class DeltaManager extends ClusterManagerBase {
// we didn't recognize the message type, do nothing
break;
} // switch
- } catch (Exception x) {
- log.error(sm.getString("deltaManager.receiveMessage.error",
getName()), x);
+ } catch (Exception e) {
+ log.error(sm.getString("deltaManager.receiveMessage.error",
getName()), e);
} finally {
currentThread.setContextClassLoader(contextLoader);
}
@@ -1312,7 +1312,7 @@ public class DeltaManager extends ClusterManagerBase {
if (getSendAllSessionsWaitTime() > 0 && remain > 0) {
try {
Thread.sleep(getSendAllSessionsWaitTime());
- } catch (Exception sleep) {
+ } catch (Exception ignore) {
// Ignore
}
}
diff --git a/java/org/apache/catalina/ha/session/DeltaRequest.java
b/java/org/apache/catalina/ha/session/DeltaRequest.java
index 753dc44f62..d37592679b 100644
--- a/java/org/apache/catalina/ha/session/DeltaRequest.java
+++ b/java/org/apache/catalina/ha/session/DeltaRequest.java
@@ -147,8 +147,8 @@ public class DeltaRequest implements Externalizable {
if (!this.actionPool.isEmpty()) {
try {
info = actionPool.removeFirst();
- } catch (Exception x) {
- log.error(sm.getString("deltaRequest.removeUnable"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("deltaRequest.removeUnable"), e);
info = new AttributeInfo(type, action, name, value);
}
info.init(type, action, name, value);
@@ -251,8 +251,8 @@ public class DeltaRequest implements Externalizable {
AttributeInfo info = actions.removeFirst();
info.recycle();
actionPool.addLast(info);
- } catch (Exception x) {
- log.error(sm.getString("deltaRequest.removeUnable"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("deltaRequest.removeUnable"), e);
}
}
}
@@ -293,8 +293,8 @@ public class DeltaRequest implements Externalizable {
if (!this.actionPool.isEmpty()) {
try {
info = actionPool.removeFirst();
- } catch (Exception x) {
- log.error(sm.getString("deltaRequest.removeUnable"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("deltaRequest.removeUnable"), e);
info = new AttributeInfo();
}
} else {
diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
index 747a93271b..e5c38fce32 100644
--- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java
+++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java
@@ -376,9 +376,9 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
if (isCrossContext) {
sendCrossContextSession();
}
- } catch (Exception x) {
+ } catch (Exception e) {
// FIXME we have a lot of sends, but the trouble with one node
stops the correct replication to other nodes!
- log.error(sm.getString("ReplicationValve.send.failure"), x);
+ log.error(sm.getString("ReplicationValve.send.failure"), e);
} finally {
if (doStatistics()) {
updateStats(totalstart, start, isAsync);
@@ -505,8 +505,8 @@ public class ReplicationValve extends ValveBase implements
ClusterValve {
for (String invalidId : invalidIds) {
try {
send(manager, invalidId);
- } catch (Exception x) {
-
log.error(sm.getString("ReplicationValve.send.invalid.failure", invalidId), x);
+ } catch (Exception e) {
+
log.error(sm.getString("ReplicationValve.send.invalid.failure", invalidId), e);
}
}
}
diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
index 99b818cccc..811076354a 100644
--- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
+++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
@@ -345,8 +345,8 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
try {
manager = managerTemplate.cloneFromTemplate();
manager.setName(name);
- } catch (Exception x) {
-
log.error(sm.getString("simpleTcpCluster.clustermanager.cloneFailed"), x);
+ } catch (Exception e) {
+
log.error(sm.getString("simpleTcpCluster.clustermanager.cloneFailed"), e);
manager = new DeltaManager();
} finally {
if (manager != null) {
@@ -468,9 +468,9 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
clusterDeployer.start();
}
registerMember(channel.getLocalMember(false));
- } catch (Exception x) {
- log.error(sm.getString("simpleTcpCluster.startUnable"), x);
- throw new LifecycleException(x);
+ } catch (Exception e) {
+ log.error(sm.getString("simpleTcpCluster.startUnable"), e);
+ throw new LifecycleException(e);
}
setState(LifecycleState.STARTING);
@@ -558,8 +558,8 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
channel.removeChannelListener(this);
channel.removeMembershipListener(this);
this.unregisterClusterValve();
- } catch (Exception x) {
- log.error(sm.getString("simpleTcpCluster.stopUnable"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("simpleTcpCluster.stopUnable"), e);
}
channel.setUtilityExecutor(null);
@@ -610,8 +610,8 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
log.debug(sm.getString("simpleTcpCluster.noMembers", msg));
}
}
- } catch (Exception x) {
- log.error(sm.getString("simpleTcpCluster.sendFailed"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("simpleTcpCluster.sendFailed"), e);
}
}
@@ -629,8 +629,8 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
// Notify our interested LifecycleListeners
fireLifecycleEvent(AFTER_MEMBERREGISTER_EVENT, member);
- } catch (Exception x) {
- log.error(sm.getString("simpleTcpCluster.member.addFailed"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("simpleTcpCluster.member.addFailed"), e);
}
}
@@ -649,8 +649,8 @@ public class SimpleTcpCluster extends LifecycleMBeanBase
// Notify our interested LifecycleListeners
fireLifecycleEvent(AFTER_MEMBERUNREGISTER_EVENT, member);
- } catch (Exception x) {
- log.error(sm.getString("simpleTcpCluster.member.removeFailed"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("simpleTcpCluster.member.removeFailed"), e);
}
}
diff --git a/java/org/apache/catalina/manager/JMXProxyServlet.java
b/java/org/apache/catalina/manager/JMXProxyServlet.java
index 2d9a2a8960..bc5d87c327 100644
--- a/java/org/apache/catalina/manager/JMXProxyServlet.java
+++ b/java/org/apache/catalina/manager/JMXProxyServlet.java
@@ -150,9 +150,9 @@ public class JMXProxyServlet extends HttpServlet {
writer.print(" = ");
writer.println(MBeanDumper.escape(valueStr));
- } catch (Exception ex) {
- writer.println("Error - " + ex.toString());
- ex.printStackTrace(writer);
+ } catch (Exception e) {
+ writer.println("Error - " + e.toString());
+ e.printStackTrace(writer);
}
}
@@ -161,9 +161,9 @@ public class JMXProxyServlet extends HttpServlet {
try {
setAttributeInternal(onameStr, att, val);
writer.println("OK - Attribute set");
- } catch (Exception ex) {
- writer.println("Error - " + ex.toString());
- ex.printStackTrace(writer);
+ } catch (Exception e) {
+ writer.println("Error - " + e.toString());
+ e.printStackTrace(writer);
}
}
@@ -175,9 +175,9 @@ public class JMXProxyServlet extends HttpServlet {
names = mBeanServer.queryNames(new ObjectName(qry), null);
writer.println("OK - Number of results: " + names.size());
writer.println();
- } catch (Exception ex) {
- writer.println("Error - " + ex.toString());
- ex.printStackTrace(writer);
+ } catch (Exception e) {
+ writer.println("Error - " + e.toString());
+ e.printStackTrace(writer);
return;
}
@@ -207,9 +207,9 @@ public class JMXProxyServlet extends HttpServlet {
} else {
writer.println("OK - Operation " + op + " without return
value");
}
- } catch (Exception ex) {
- writer.println("Error - " + ex.toString());
- ex.printStackTrace(writer);
+ } catch (Exception e) {
+ writer.println("Error - " + e.toString());
+ e.printStackTrace(writer);
}
}
diff --git
a/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
b/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
index f2b15c13ba..a75d20a83a 100644
--- a/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
+++ b/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
@@ -97,8 +97,8 @@ public class StoreConfigLifecycleListener implements
LifecycleListener {
// Note: Hard-coded domain used since this object is per Server/JVM
oname = new ObjectName("Catalina:type=StoreConfig");
registry.registerComponent(storeConfig, oname, "StoreConfig");
- } catch (Exception ex) {
- log.error(sm.getString("storeConfigListener.registerError"), ex);
+ } catch (Exception e) {
+ log.error(sm.getString("storeConfigListener.registerError"), e);
}
}
diff --git a/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
b/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
index 93a68183cf..2970963658 100644
--- a/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
+++ b/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
@@ -174,8 +174,8 @@ public class ChannelCoordinator extends
ChannelInterceptorBase implements Messag
startLevel = (startLevel | svc);
} catch (ChannelException cx) {
throw cx;
- } catch (Exception x) {
- throw new ChannelException(x);
+ } catch (Exception e) {
+ throw new ChannelException(e);
}
}
@@ -230,8 +230,8 @@ public class ChannelCoordinator extends
ChannelInterceptorBase implements Messag
startLevel = (startLevel & (~svc));
setChannel(null);
- } catch (Exception x) {
- throw new ChannelException(x);
+ } catch (Exception e) {
+ throw new ChannelException(e);
}
}
diff --git a/java/org/apache/catalina/tribes/group/GroupChannel.java
b/java/org/apache/catalina/tribes/group/GroupChannel.java
index f2afc47a1c..39c04fb80f 100644
--- a/java/org/apache/catalina/tribes/group/GroupChannel.java
+++ b/java/org/apache/catalina/tribes/group/GroupChannel.java
@@ -278,8 +278,8 @@ public class GroupChannel extends ChannelInterceptorBase
implements ManagedChann
} else {
try {
fwd =
XByteBuffer.deserialize(msg.getMessage().getBytesDirect(), 0,
msg.getMessage().getLength());
- } catch (Exception sx) {
- log.error(sm.getString("groupChannel.unable.deserialize",
msg), sx);
+ } catch (Exception e) {
+ log.error(sm.getString("groupChannel.unable.deserialize",
msg), e);
return;
}
}
@@ -311,13 +311,13 @@ public class GroupChannel extends ChannelInterceptorBase
implements ManagedChann
Logs.MESSAGES.trace("GroupChannel delivered[" + delivered + "]
id:" + new UniqueId(msg.getUniqueId()));
}
- } catch (Exception x) {
+ } catch (Exception e) {
// 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);
+ log.warn(sm.getString("groupChannel.receiving.error"), e);
}
- throw new
RemoteProcessException(sm.getString("groupChannel.receiving.error"), x);
+ throw new
RemoteProcessException(sm.getString("groupChannel.receiving.error"), e);
}
}
@@ -337,8 +337,8 @@ public class GroupChannel extends ChannelInterceptorBase
implements ManagedChann
}
RpcMessage.NoRpcChannelReply reply = new
RpcMessage.NoRpcChannelReply(msg.rpcId, msg.uuid);
send(new Member[] { destination }, reply,
SEND_OPTIONS_ASYNCHRONOUS);
- } catch (Exception x) {
- log.error(sm.getString("groupChannel.sendFail.noRpcChannelReply"),
x);
+ } catch (Exception e) {
+ log.error(sm.getString("groupChannel.sendFail.noRpcChannelReply"),
e);
}
}
diff --git a/java/org/apache/catalina/tribes/group/RpcChannel.java
b/java/org/apache/catalina/tribes/group/RpcChannel.java
index d9c765548f..19b68f32f0 100644
--- a/java/org/apache/catalina/tribes/group/RpcChannel.java
+++ b/java/org/apache/catalina/tribes/group/RpcChannel.java
@@ -175,11 +175,11 @@ public class RpcChannel implements ChannelListener {
replyMessageOptions &
~Channel.SEND_OPTIONS_SYNCHRONIZED_ACK);
}
finished = true;
- } catch (Exception x) {
+ } catch (Exception e) {
if (excallback != null && !asyncReply) {
- excallback.replyFailed(rmsg.message, reply, sender, x);
+ excallback.replyFailed(rmsg.message, reply, sender, e);
} else {
- log.error(sm.getString("rpcChannel.replyFailed"), x);
+ log.error(sm.getString("rpcChannel.replyFailed"), e);
}
}
if (finished && excallback != null && !asyncReply) {
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
b/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
index 559f0c59ef..cfbd291779 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
@@ -148,9 +148,9 @@ public class FragmentationInterceptor extends
ChannelInterceptorBase implements
removeFragCollection(key);
}
}
- } catch (Exception x) {
+ } catch (Exception e) {
if (log.isErrorEnabled()) {
-
log.error(sm.getString("fragmentationInterceptor.heartbeat.failed"), x);
+
log.error(sm.getString("fragmentationInterceptor.heartbeat.failed"), e);
}
}
super.heartbeat();
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
b/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
index b7758bc53c..6ee989d46c 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
@@ -244,18 +244,18 @@ public class MessageDispatchInterceptor extends
ChannelInterceptorBase implement
if (handler != null) {
handler.handleCompletion(new UniqueId(msg.getUniqueId()));
}
- } catch (Exception ex) {
-
log.error(sm.getString("messageDispatchInterceptor.completeMessage.failed"),
ex);
+ } catch (Exception e) {
+
log.error(sm.getString("messageDispatchInterceptor.completeMessage.failed"), e);
}
- } catch (Exception x) {
+ } catch (Exception e) {
ChannelException cx;
- if (x instanceof ChannelException) {
- cx = (ChannelException) x;
+ if (e instanceof ChannelException) {
+ cx = (ChannelException) e;
} else {
- cx = new ChannelException(x);
+ cx = new ChannelException(e);
}
if (log.isDebugEnabled()) {
-
log.debug(sm.getString("messageDispatchInterceptor.AsyncMessage.failed"), x);
+
log.debug(sm.getString("messageDispatchInterceptor.AsyncMessage.failed"), e);
}
try {
if (handler != null) {
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
index ba3d4b65f8..6e91edeed0 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
@@ -323,8 +323,8 @@ public class NonBlockingCoordinator extends
ChannelInterceptorBase {
return true;
} catch (SocketTimeoutException | ConnectException x) {
// do nothing, we couldn't connect
- } catch (Exception x) {
-
log.error(sm.getString("nonBlockingCoordinator.memberAlive.failed"), x);
+ } catch (Exception e) {
+
log.error(sm.getString("nonBlockingCoordinator.memberAlive.failed"), e);
}
return false;
}
@@ -626,8 +626,8 @@ public class NonBlockingCoordinator extends
ChannelInterceptorBase {
startElection(true);
}
}
- } catch (Exception x) {
- log.error(sm.getString("nonBlockingCoordinator.heartbeat.failed"),
x);
+ } catch (Exception e) {
+ log.error(sm.getString("nonBlockingCoordinator.heartbeat.failed"),
e);
} finally {
super.heartbeat();
}
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
index 9c1b356a45..0623ecf663 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
@@ -250,8 +250,8 @@ public class TcpFailureDetector extends
ChannelInterceptorBase implements TcpFai
performForcedCheck();
}
}
- } catch (Exception x) {
- log.warn(sm.getString("tcpFailureDetector.heartbeat.failed"), x);
+ } catch (Exception e) {
+ log.warn(sm.getString("tcpFailureDetector.heartbeat.failed"), e);
}
}
@@ -383,8 +383,8 @@ public class TcpFailureDetector extends
ChannelInterceptorBase implements TcpFai
return true;
} catch (SocketTimeoutException | ConnectException |
NoRouteToHostException noop) {
// do nothing, we couldn't connect
- } catch (Exception x) {
-
log.error(sm.getString("tcpFailureDetector.failureDetection.failed", mbr), x);
+ } catch (Exception e) {
+
log.error(sm.getString("tcpFailureDetector.failureDetection.failed", mbr), e);
}
return false;
}
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
b/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
index d340c9b955..4fa0fd41d8 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
@@ -191,8 +191,8 @@ public class TcpPingInterceptor extends
ChannelInterceptorBase implements TcpPin
// Ignore. Probably triggered by a call to stop().
// In the highly unlikely event it was a different trigger,
// simply ignore it and continue.
- } catch (Exception x) {
-
log.warn(sm.getString("tcpPingInterceptor.pingFailed.pingThread"), x);
+ } catch (Exception e) {
+
log.warn(sm.getString("tcpPingInterceptor.pingFailed.pingThread"), e);
}
}
}
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
b/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
index cec2b0df89..c91a503e8f 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
+++
b/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
@@ -129,8 +129,8 @@ public class TwoPhaseCommitInterceptor extends
ChannelInterceptorBase {
messages.remove(entry.id);
}
}
- } catch (Exception x) {
-
log.warn(sm.getString("twoPhaseCommitInterceptor.heartbeat.failed"), x);
+ } catch (Exception e) {
+
log.warn(sm.getString("twoPhaseCommitInterceptor.heartbeat.failed"), e);
} finally {
super.heartbeat();
}
diff --git a/java/org/apache/catalina/tribes/io/ReplicationStream.java
b/java/org/apache/catalina/tribes/io/ReplicationStream.java
index b0fd419e21..279b7a4a68 100644
--- a/java/org/apache/catalina/tribes/io/ReplicationStream.java
+++ b/java/org/apache/catalina/tribes/io/ReplicationStream.java
@@ -83,7 +83,7 @@ public final class ReplicationStream extends
ObjectInputStream {
} else {
return findExternalClass(name);
}
- } catch (Exception x) {
+ } catch (Exception e) {
if (tryRepFirst) {
return findExternalClass(name);
} else {
diff --git a/java/org/apache/catalina/tribes/membership/McastService.java
b/java/org/apache/catalina/tribes/membership/McastService.java
index 873d2db4d5..4946e689fb 100644
--- a/java/org/apache/catalina/tribes/membership/McastService.java
+++ b/java/org/apache/catalina/tribes/membership/McastService.java
@@ -320,15 +320,15 @@ public class McastService extends MembershipServiceBase
implements MessageListen
if (properties.getProperty("mcastTTL") != null) {
try {
ttl = Integer.parseInt(properties.getProperty("mcastTTL"));
- } catch (Exception x) {
- log.error(sm.getString("McastService.parseTTL",
properties.getProperty("mcastTTL")), x);
+ } catch (Exception e) {
+ log.error(sm.getString("McastService.parseTTL",
properties.getProperty("mcastTTL")), e);
}
}
if (properties.getProperty("mcastSoTimeout") != null) {
try {
soTimeout =
Integer.parseInt(properties.getProperty("mcastSoTimeout"));
- } catch (Exception x) {
- log.error(sm.getString("McastService.parseSoTimeout",
properties.getProperty("mcastSoTimeout")), x);
+ } catch (Exception e) {
+ log.error(sm.getString("McastService.parseSoTimeout",
properties.getProperty("mcastSoTimeout")), e);
}
}
@@ -372,8 +372,8 @@ public class McastService extends MembershipServiceBase
implements MessageListen
impl = null;
channel = null;
}
- } catch (Exception x) {
- log.error(sm.getString("McastService.stopFail",
Integer.valueOf(svc)), x);
+ } catch (Exception e) {
+ log.error(sm.getString("McastService.stopFail",
Integer.valueOf(svc)), e);
}
}
@@ -411,8 +411,8 @@ public class McastService extends MembershipServiceBase
implements MessageListen
DatagramPacket packet = new DatagramPacket(data, 0, data.length);
try {
impl.send(false, packet);
- } catch (Exception x) {
- throw new ChannelException(x);
+ } catch (Exception e) {
+ throw new ChannelException(e);
}
}
@@ -454,8 +454,8 @@ public class McastService extends MembershipServiceBase
implements MessageListen
if (impl != null) {
impl.send(false);
}
- } catch (Exception x) {
- log.error(sm.getString("McastService.payload"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("McastService.payload"), e);
}
}
}
@@ -469,8 +469,8 @@ public class McastService extends MembershipServiceBase
implements MessageListen
if (impl != null) {
impl.send(false);
}
- } catch (Exception x) {
- log.error(sm.getString("McastService.domain"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("McastService.domain"), e);
}
}
}
diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
index df15ea7c0b..950f582d19 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -474,8 +474,8 @@ public class McastServiceImpl extends
MembershipProviderBase {
}
};
executor.execute(t);
- } catch (Exception x) {
-
log.error(sm.getString("mcastServiceImpl.memberDisappeared.failed"), x);
+ } catch (Exception e) {
+
log.error(sm.getString("mcastServiceImpl.memberDisappeared.failed"), e);
}
}
}
@@ -567,14 +567,14 @@ public class McastServiceImpl extends
MembershipProviderBase {
if (log.isDebugEnabled()) {
log.debug(sm.getString("mcastServiceImpl.invalidMemberPackage"), ax);
}
- } catch (Exception x) {
+ } catch (Exception e) {
if (errorCounter == 0 && doRunReceiver) {
-
log.warn(sm.getString("mcastServiceImpl.error.receiving"), x);
+
log.warn(sm.getString("mcastServiceImpl.error.receiving"), e);
} else if (log.isDebugEnabled()) {
if (doRunReceiver) {
-
log.debug(sm.getString("mcastServiceImpl.error.receiving"), x);
+
log.debug(sm.getString("mcastServiceImpl.error.receiving"), e);
} else {
-
log.warn(sm.getString("mcastServiceImpl.error.receivingNoSleep"), x);
+
log.warn(sm.getString("mcastServiceImpl.error.receivingNoSleep"), e);
}
}
if (doRunReceiver) {
@@ -613,11 +613,11 @@ public class McastServiceImpl extends
MembershipProviderBase {
try {
send(true);
errorCounter = 0;
- } catch (Exception x) {
+ } catch (Exception e) {
if (errorCounter == 0) {
- log.warn(sm.getString("mcastServiceImpl.send.failed"),
x);
+ log.warn(sm.getString("mcastServiceImpl.send.failed"),
e);
} else {
-
log.debug(sm.getString("mcastServiceImpl.send.failed"), x);
+
log.debug(sm.getString("mcastServiceImpl.send.failed"), e);
}
if ((++errorCounter) >= recoveryCounter) {
errorCounter = 0;
@@ -668,8 +668,8 @@ public class McastServiceImpl extends
MembershipProviderBase {
try {
parent.stop(Channel.MBR_RX_SEQ | Channel.MBR_TX_SEQ);
return true;
- } catch (Exception x) {
- log.warn(sm.getString("mcastServiceImpl.recovery.stopFailed"),
x);
+ } catch (Exception e) {
+ log.warn(sm.getString("mcastServiceImpl.recovery.stopFailed"),
e);
return false;
}
}
@@ -679,8 +679,8 @@ public class McastServiceImpl extends
MembershipProviderBase {
parent.init();
parent.start(Channel.MBR_RX_SEQ | Channel.MBR_TX_SEQ);
return true;
- } catch (Exception x) {
-
log.warn(sm.getString("mcastServiceImpl.recovery.startFailed"), x);
+ } catch (Exception e) {
+
log.warn(sm.getString("mcastServiceImpl.recovery.startFailed"), e);
return false;
}
}
diff --git
a/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
b/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
index 5c2b9c4f89..042d661aad 100644
--- a/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
+++ b/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
@@ -397,8 +397,8 @@ public class StaticMembershipProvider extends
MembershipProviderBase
ping();
} catch (InterruptedException ix) {
// Ignore
- } catch (Exception x) {
-
log.warn(sm.getString("staticMembershipProvider.pingThread.failed"), x);
+ } catch (Exception e) {
+
log.warn(sm.getString("staticMembershipProvider.pingThread.failed"), e);
}
}
}
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index e62c042e8d..2150937838 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -717,8 +717,8 @@ public abstract class AbstractReplicatedMap<K, V>
diff.lock();
try {
diff.applyDiff(mapmsg.getDiffValue(), 0,
mapmsg.getDiffValue().length);
- } catch (Exception x) {
-
log.error(sm.getString("abstractReplicatedMap.unableApply.diff",
entry.getKey()), x);
+ } catch (Exception e) {
+
log.error(sm.getString("abstractReplicatedMap.unableApply.diff",
entry.getKey()), e);
} finally {
diff.unlock();
}
@@ -982,8 +982,8 @@ public abstract class AbstractReplicatedMap<K, V>
if (this.state.isAvailable()) {
ping(accessTimeout);
}
- } catch (Exception x) {
- log.error(sm.getString("abstractReplicatedMap.heartbeat.failed"),
x);
+ } catch (Exception e) {
+ log.error(sm.getString("abstractReplicatedMap.heartbeat.failed"),
e);
}
}
@@ -1526,8 +1526,8 @@ public abstract class AbstractReplicatedMap<K, V>
public Serializable getKey() {
try {
return key(null);
- } catch (Exception x) {
- throw new
RuntimeException(sm.getString("mapMessage.deserialize.error.key"), x);
+ } catch (Exception e) {
+ throw new
RuntimeException(sm.getString("mapMessage.deserialize.error.key"), e);
}
}
@@ -1550,8 +1550,8 @@ public abstract class AbstractReplicatedMap<K, V>
public Serializable getValue() {
try {
return value(null);
- } catch (Exception x) {
- throw new
RuntimeException(sm.getString("mapMessage.deserialize.error.value"), x);
+ } catch (Exception e) {
+ throw new
RuntimeException(sm.getString("mapMessage.deserialize.error.value"), e);
}
}
diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
index 93aa4cfaef..6dae27f5b2 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
@@ -72,12 +72,12 @@ public class NioReceiver extends ReceiverBase implements
Runnable, NioReceiverMB
super.start();
try {
setPool(new RxTaskPool(getMaxThreads(), getMinThreads(), this));
- } catch (Exception x) {
- log.fatal(sm.getString("nioReceiver.threadpool.fail"), x);
- if (x instanceof IOException) {
- throw (IOException) x;
+ } catch (Exception e) {
+ log.fatal(sm.getString("nioReceiver.threadpool.fail"), e);
+ if (e instanceof IOException) {
+ throw (IOException) e;
} else {
- throw new IOException(x.getMessage());
+ throw new IOException(e.getMessage());
}
}
try {
@@ -90,12 +90,12 @@ public class NioReceiver extends ReceiverBase implements
Runnable, NioReceiverMB
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;
+ } catch (Exception e) {
+ log.fatal(sm.getString("nioReceiver.start.fail"), e);
+ if (e instanceof IOException) {
+ throw (IOException) e;
} else {
- throw new IOException(x.getMessage());
+ throw new IOException(e.getMessage());
}
}
}
@@ -167,8 +167,8 @@ public class NioReceiver extends ReceiverBase implements
Runnable, NioReceiverMB
log.trace("Processing event in selector:" + r);
}
r.run();
- } catch (Exception x) {
- log.error(sm.getString("nioReceiver.eventsError"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("nioReceiver.eventsError"), e);
}
}
}
@@ -377,8 +377,8 @@ public class NioReceiver extends ReceiverBase implements
Runnable, NioReceiverMB
log.warn(sm.getString("nioReceiver.stop.threadRunning"));
}
closeSelector();
- } catch (Exception x) {
- log.error(sm.getString("nioReceiver.stop.fail"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("nioReceiver.stop.fail"), e);
} finally {
this.selector.set(null);
}
@@ -444,8 +444,8 @@ public class NioReceiver extends ReceiverBase implements
Runnable, NioReceiverMB
running = true;
try {
listen();
- } catch (Exception x) {
- log.error(sm.getString("nioReceiver.run.fail"), x);
+ } catch (Exception e) {
+ log.error(sm.getString("nioReceiver.run.fail"), e);
} finally {
running = false;
}
diff --git
a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
index aa65ace7bf..b5bb93685d 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
@@ -280,8 +280,8 @@ public class NioReplicationTask extends AbstractRxTask {
log.trace("CKX Cancelling key:" + key);
}
- } catch (Exception x) {
-
log.error(sm.getString("nioReplicationTask.error.register.key", key), x);
+ } catch (Exception e) {
+
log.error(sm.getString("nioReplicationTask.error.register.key", key), e);
}
};
receiver.addEvent(r);
diff --git a/java/org/apache/catalina/tribes/transport/nio/NioSender.java
b/java/org/apache/catalina/tribes/transport/nio/NioSender.java
index 0db8c0fa54..4fd964223e 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioSender.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioSender.java
@@ -276,13 +276,13 @@ public class NioSender extends AbstractSender {
try {
try {
socketChannel.socket().close();
- } catch (Exception x) {
+ } catch (Exception e) {
// Ignore
}
// error free close, all the way
try {
socketChannel.close();
- } catch (Exception x) {
+ } catch (Exception e) {
// Ignore
}
} finally {
@@ -293,23 +293,23 @@ public class NioSender extends AbstractSender {
try {
try {
dataChannel.socket().close();
- } catch (Exception x) {
+ } catch (Exception e) {
// Ignore
}
// error free close, all the way
try {
dataChannel.close();
- } catch (Exception x) {
+ } catch (Exception e) {
// Ignore
}
} finally {
dataChannel = null;
}
}
- } catch (Exception x) {
- log.error(sm.getString("nioSender.unable.disconnect",
x.getMessage()));
+ } catch (Exception e) {
+ log.error(sm.getString("nioSender.unable.disconnect",
e.getMessage()));
if (log.isDebugEnabled()) {
- log.debug(sm.getString("nioSender.unable.disconnect",
x.getMessage()), x);
+ log.debug(sm.getString("nioSender.unable.disconnect",
e.getMessage()), e);
}
}
}
diff --git
a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
index d3c60af514..71ac24ca3c 100644
--- a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
+++ b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
@@ -88,20 +88,20 @@ public class ParallelNioSender extends AbstractSender
implements MultiPointSende
cx.addFaultyMember(result.getFailed().getFaultyMembers());
}
}
- } catch (Exception x) {
+ } catch (Exception e) {
if (log.isTraceEnabled()) {
- log.trace("Error sending message", x);
+ log.trace("Error sending message", e);
}
if (cx == null) {
- if (x instanceof ChannelException) {
- cx = (ChannelException) x;
+ if (e instanceof ChannelException) {
+ cx = (ChannelException) e;
} else {
- cx = new
ChannelException(sm.getString("parallelNioSender.send.failed"), x);
+ cx = new
ChannelException(sm.getString("parallelNioSender.send.failed"), e);
}
}
for (NioSender sender : senders) {
if (!sender.isComplete()) {
- cx.addFaultyMember(sender.getDestination(), x);
+ cx.addFaultyMember(sender.getDestination(), e);
}
}
throw cx;
@@ -126,16 +126,16 @@ public class ParallelNioSender extends AbstractSender
implements MultiPointSende
// there was an error
throw cx;
}
- } catch (Exception x) {
+ } catch (Exception e) {
try {
this.disconnect();
- } catch (Exception e) {
+ } catch (Exception ignore) {
// Ignore
}
- if (x instanceof ChannelException) {
- throw (ChannelException) x;
+ if (e instanceof ChannelException) {
+ throw (ChannelException) e;
} else {
- throw new ChannelException(x);
+ throw new ChannelException(e);
}
}
@@ -173,9 +173,9 @@ public class ParallelNioSender extends AbstractSender
implements MultiPointSende
}
SenderState.getSenderState(sender.getDestination()).setReady();
} // end if
- } catch (Exception x) {
+ } catch (Exception e) {
if (log.isTraceEnabled()) {
- log.trace("Error while processing send to " +
sender.getDestination().getName(), x);
+ log.trace("Error while processing send to " +
sender.getDestination().getName(), e);
}
SenderState state =
SenderState.getSenderState(sender.getDestination());
int attempt = sender.getAttempt() + 1;
@@ -192,7 +192,7 @@ public class ParallelNioSender extends AbstractSender
implements MultiPointSende
log.warn(sm.getString("parallelNioSender.send.fail.retrying",
sender.getDestination().getName()));
} else {
-
log.warn(sm.getString("parallelNioSender.send.fail",
sender.getDestination().getName()), x);
+
log.warn(sm.getString("parallelNioSender.send.fail",
sender.getDestination().getName()), e);
}
}
}
@@ -200,8 +200,8 @@ public class ParallelNioSender extends AbstractSender
implements MultiPointSende
log.warn(sm.getString("parallelNioSender.sender.disconnected.notRetry",
sender.getDestination().getName()));
ChannelException cx =
- new
ChannelException(sm.getString("parallelNioSender.sender.disconnected.sendFailed"),
x);
- cx.addFaultyMember(sender.getDestination(), x);
+ new
ChannelException(sm.getString("parallelNioSender.sender.disconnected.sendFailed"),
e);
+ cx.addFaultyMember(sender.getDestination(), e);
result.failed(cx);
break;
}
@@ -218,8 +218,8 @@ public class ParallelNioSender extends AbstractSender
implements MultiPointSende
}
} else {
ChannelException cx = new
ChannelException(sm.getString("parallelNioSender.sendFailed.attempt",
- Integer.toString(sender.getAttempt()),
Integer.toString(maxAttempts)), x);
- cx.addFaultyMember(sender.getDestination(), x);
+ Integer.toString(sender.getAttempt()),
Integer.toString(maxAttempts)), e);
+ cx.addFaultyMember(sender.getDestination(), e);
result.failed(cx);
} // end if
}
@@ -366,7 +366,7 @@ public class ParallelNioSender extends AbstractSender
implements MultiPointSende
setConnected(false);
try {
close();
- } catch (Exception x) {
+ } catch (Exception e) {
// Ignore
}
}
@@ -390,8 +390,8 @@ public class ParallelNioSender extends AbstractSender
implements MultiPointSende
// nioSenders.remove(entry.getKey());
i.remove();
result = true;
- } catch (Exception x) {
- log.warn(sm.getString("parallelNioSender.error.keepalive",
sender), x);
+ } catch (Exception e) {
+ log.warn(sm.getString("parallelNioSender.error.keepalive",
sender), e);
}
}
}
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java
b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 69c87e9e71..e20a048558 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -630,8 +630,8 @@ public class MemoryUserDatabase implements UserDatabase {
writeLock.unlock();
}
}
- } catch (Exception ioe) {
- log.error(sm.getString("memoryUserDatabase.reloadError", id, uri),
ioe);
+ } catch (Exception e) {
+ log.error(sm.getString("memoryUserDatabase.reloadError", id, uri),
e);
} finally {
if (uConn != null) {
try {
diff --git a/java/org/apache/catalina/valves/PersistentValve.java
b/java/org/apache/catalina/valves/PersistentValve.java
index 73d0728c9d..442cf10493 100644
--- a/java/org/apache/catalina/valves/PersistentValve.java
+++ b/java/org/apache/catalina/valves/PersistentValve.java
@@ -198,7 +198,7 @@ public class PersistentValve extends ValveBase {
Session hsess;
try {
hsess = request.getSessionInternal(false);
- } catch (Exception ex) {
+ } catch (Exception e) {
hsess = null;
}
String newsessionId = null;
diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java
index d50fc2ac3a..9de6fd7b98 100644
--- a/java/org/apache/jasper/JspC.java
+++ b/java/org/apache/jasper/JspC.java
@@ -792,7 +792,7 @@ public class JspC extends Task implements Options {
}
try {
uriRoot = resolveFile(s).getCanonicalPath();
- } catch (Exception ex) {
+ } catch (Exception e) {
uriRoot = s;
}
}
diff --git a/java/org/apache/jasper/JspCompilationContext.java
b/java/org/apache/jasper/JspCompilationContext.java
index 116e1c49b8..f9260a1da6 100644
--- a/java/org/apache/jasper/JspCompilationContext.java
+++ b/java/org/apache/jasper/JspCompilationContext.java
@@ -601,8 +601,8 @@ public class JspCompilationContext {
} catch (FileNotFoundException fnfe) {
// Re-throw to let caller handle this - will result in a 404
throw fnfe;
- } catch (Exception ex) {
- JasperException je = new
JasperException(Localizer.getMessage("jsp.error.unable.compile"), ex);
+ } catch (Exception e) {
+ JasperException je = new
JasperException(Localizer.getMessage("jsp.error.unable.compile"), e);
// Cache compilation exception
jsw.setCompilationException(je);
throw je;
@@ -622,8 +622,8 @@ public class JspCompilationContext {
servletClass = jspLoader.loadClass(name);
} catch (ClassNotFoundException cex) {
throw new
JasperException(Localizer.getMessage("jsp.error.unable.load"), cex);
- } catch (Exception ex) {
- throw new
JasperException(Localizer.getMessage("jsp.error.unable.compile"), ex);
+ } catch (Exception e) {
+ throw new
JasperException(Localizer.getMessage("jsp.error.unable.compile"), e);
}
removed = false;
return servletClass;
diff --git a/java/org/apache/jasper/compiler/JspReader.java
b/java/org/apache/jasper/compiler/JspReader.java
index c5ad96aab0..fefbaf3435 100644
--- a/java/org/apache/jasper/compiler/JspReader.java
+++ b/java/org/apache/jasper/compiler/JspReader.java
@@ -116,9 +116,9 @@ class JspReader {
if (reader != null) {
try {
reader.close();
- } catch (Exception any) {
+ } catch (Exception e) {
if (log.isDebugEnabled()) {
-
log.debug(Localizer.getMessage("jsp.error.file.close"), any);
+
log.debug(Localizer.getMessage("jsp.error.file.close"), e);
}
}
}
diff --git a/java/org/apache/jasper/compiler/Parser.java
b/java/org/apache/jasper/compiler/Parser.java
index 435bd333a0..eb8eefbaeb 100644
--- a/java/org/apache/jasper/compiler/Parser.java
+++ b/java/org/apache/jasper/compiler/Parser.java
@@ -328,8 +328,8 @@ class Parser implements TagConstants {
}
} catch (FileNotFoundException ex) {
err.jspError(start, "jsp.error.file.not.found", file);
- } catch (Exception ex) {
- err.jspError(start, ex.getMessage());
+ } catch (Exception e) {
+ err.jspError(start, e.getMessage());
}
}
diff --git a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
index 50a339dc55..8214c586fd 100644
--- a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
+++ b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
@@ -275,8 +275,8 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements
TagConstants {
if (url.getProtocol().equals("war") && uri.endsWith(".jar")) {
url = UriUtil.warToJar(url);
}
- } catch (Exception ex) {
- err.jspError("jsp.error.tld.unable_to_get_jar", uri,
ex.toString());
+ } catch (Exception e) {
+ err.jspError("jsp.error.tld.unable_to_get_jar", uri, e.toString());
}
if (uri.endsWith(".jar")) {
if (url == null) {
diff --git a/java/org/apache/jasper/el/JasperELResolver.java
b/java/org/apache/jasper/el/JasperELResolver.java
index 644a002341..1a91f01403 100644
--- a/java/org/apache/jasper/el/JasperELResolver.java
+++ b/java/org/apache/jasper/el/JasperELResolver.java
@@ -200,8 +200,8 @@ public class JasperELResolver extends CompositeELResolver {
try {
method.setAccessible(true);
value = method.invoke(base, (Object[]) null);
- } catch (Exception ex) {
- Throwable thr =
ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr =
ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
}
}
@@ -219,8 +219,8 @@ public class JasperELResolver extends CompositeELResolver {
context.setPropertyResolved(base, property);
try {
method.invoke(base, value);
- } catch (Exception ex) {
- Throwable thr =
ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr =
ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
}
}
diff --git a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
index 0a1924ff9c..e797ccf292 100644
--- a/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
+++ b/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
@@ -281,8 +281,8 @@ public class JspRuntimeLibrary {
} else {
return getValueFromPropertyEditorManager(t, propertyName, s);
}
- } catch (Exception ex) {
- throw new JasperException(ex);
+ } catch (Exception e) {
+ throw new JasperException(e);
}
}
@@ -348,10 +348,10 @@ public class JspRuntimeLibrary {
}
}
}
- } catch (Exception ex) {
- Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
- throw new JasperException(ex);
+ throw new JasperException(e);
}
if (!ignoreMethodNF && (method == null)) {
if (type == null) {
@@ -574,10 +574,10 @@ public class JspRuntimeLibrary {
try {
Method method = getReadMethod(o.getClass(), prop);
value = method.invoke(o, (Object[]) null);
- } catch (Exception ex) {
- Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
- throw new JasperException(ex);
+ throw new JasperException(e);
}
return value;
}
@@ -589,10 +589,10 @@ public class JspRuntimeLibrary {
Method method = getWriteMethod(bean.getClass(), prop);
method.invoke(bean, PageContextImpl.proprietaryEvaluate(expression,
method.getParameterTypes()[0], pageContext,
functionMapper));
- } catch (Exception ex) {
- Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
- throw new JasperException(ex);
+ throw new JasperException(e);
}
}
@@ -600,10 +600,10 @@ public class JspRuntimeLibrary {
try {
Method method = getWriteMethod(bean.getClass(), prop);
method.invoke(bean, value);
- } catch (Exception ex) {
- Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
- throw new JasperException(ex);
+ throw new JasperException(e);
}
}
@@ -611,10 +611,10 @@ public class JspRuntimeLibrary {
try {
Method method = getWriteMethod(bean.getClass(), prop);
method.invoke(bean, Integer.valueOf(value));
- } catch (Exception ex) {
- Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
- throw new JasperException(ex);
+ throw new JasperException(e);
}
}
@@ -622,10 +622,10 @@ public class JspRuntimeLibrary {
try {
Method method = getWriteMethod(bean.getClass(), prop);
method.invoke(bean, Short.valueOf(value));
- } catch (Exception ex) {
- Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
- throw new JasperException(ex);
+ throw new JasperException(e);
}
}
@@ -633,10 +633,10 @@ public class JspRuntimeLibrary {
try {
Method method = getWriteMethod(bean.getClass(), prop);
method.invoke(bean, Long.valueOf(value));
- } catch (Exception ex) {
- Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
- throw new JasperException(ex);
+ throw new JasperException(e);
}
}
@@ -644,10 +644,10 @@ public class JspRuntimeLibrary {
try {
Method method = getWriteMethod(bean.getClass(), prop);
method.invoke(bean, Double.valueOf(value));
- } catch (Exception ex) {
- Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
- throw new JasperException(ex);
+ throw new JasperException(e);
}
}
@@ -655,10 +655,10 @@ public class JspRuntimeLibrary {
try {
Method method = getWriteMethod(bean.getClass(), prop);
method.invoke(bean, Float.valueOf(value));
- } catch (Exception ex) {
- Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
- throw new JasperException(ex);
+ throw new JasperException(e);
}
}
@@ -666,10 +666,10 @@ public class JspRuntimeLibrary {
try {
Method method = getWriteMethod(bean.getClass(), prop);
method.invoke(bean, Character.valueOf(value));
- } catch (Exception ex) {
- Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
- throw new JasperException(ex);
+ throw new JasperException(e);
}
}
@@ -677,10 +677,10 @@ public class JspRuntimeLibrary {
try {
Method method = getWriteMethod(bean.getClass(), prop);
method.invoke(bean, Byte.valueOf(value));
- } catch (Exception ex) {
- Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
- throw new JasperException(ex);
+ throw new JasperException(e);
}
}
@@ -688,10 +688,10 @@ public class JspRuntimeLibrary {
try {
Method method = getWriteMethod(bean.getClass(), prop);
method.invoke(bean, Boolean.valueOf(value));
- } catch (Exception ex) {
- Throwable thr = ExceptionUtils.unwrapInvocationTargetException(ex);
+ } catch (Exception e) {
+ Throwable thr = ExceptionUtils.unwrapInvocationTargetException(e);
ExceptionUtils.handleThrowable(thr);
- throw new JasperException(ex);
+ throw new JasperException(e);
}
}
@@ -733,8 +733,8 @@ public class JspRuntimeLibrary {
break;
}
}
- } catch (Exception ex) {
- throw new JasperException(ex);
+ } catch (Exception e) {
+ throw new JasperException(e);
}
}
if (result == null) {
@@ -771,8 +771,8 @@ public class JspRuntimeLibrary {
break;
}
}
- } catch (Exception ex) {
- throw new JasperException(ex);
+ } catch (Exception e) {
+ throw new JasperException(e);
}
}
if (result == null) {
@@ -795,12 +795,12 @@ public class JspRuntimeLibrary {
PropertyEditor pe = (PropertyEditor)
propertyEditorClass.getConstructor().newInstance();
pe.setAsText(attrValue);
return pe.getValue();
- } catch (Exception ex) {
+ } catch (Exception e) {
if (attrValue.isEmpty()) {
return null;
} else {
throw new
JasperException(Localizer.getMessage("jsp.error.beans.property.conversion",
attrValue,
- attrClass.getName(), attrName, ex.getMessage()));
+ attrClass.getName(), attrName, e.getMessage()));
}
}
}
diff --git a/java/org/apache/jasper/runtime/TagHandlerPool.java
b/java/org/apache/jasper/runtime/TagHandlerPool.java
index bad84de539..f71afa4b39 100644
--- a/java/org/apache/jasper/runtime/TagHandlerPool.java
+++ b/java/org/apache/jasper/runtime/TagHandlerPool.java
@@ -69,7 +69,7 @@ public class TagHandlerPool {
if (maxSizeS != null) {
try {
maxSize = Integer.parseInt(maxSizeS);
- } catch (Exception ex) {
+ } catch (Exception e) {
// Ignore
}
}
diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java
b/java/org/apache/jasper/servlet/JspServletWrapper.java
index cecbba20b7..2989c5d71f 100644
--- a/java/org/apache/jasper/servlet/JspServletWrapper.java
+++ b/java/org/apache/jasper/servlet/JspServletWrapper.java
@@ -402,11 +402,11 @@ public class JspServletWrapper {
throw handleJspException(ex);
}
throw ex;
- } catch (Exception ex) {
+ } catch (Exception e) {
if (options.getDevelopment()) {
- throw handleJspException(ex);
+ throw handleJspException(e);
}
- throw new JasperException(ex);
+ throw new JasperException(e);
}
try {
@@ -459,11 +459,11 @@ public class JspServletWrapper {
throw new IOException(handleJspException(ex).getMessage(), ex);
}
throw ex;
- } catch (Exception ex) {
+ } catch (Exception e) {
if (options.getDevelopment()) {
- throw handleJspException(ex);
+ throw handleJspException(e);
}
- throw new JasperException(ex);
+ throw new JasperException(e);
}
}
@@ -577,7 +577,7 @@ public class JspServletWrapper {
return new JasperException(
Localizer.getMessage("jsp.exception",
detail.getJspFileName(), "" + source.lineNumber()), ex);
- } catch (Exception je) {
+ } catch (Exception e) {
// If anything goes wrong, just revert to the original behaviour
if (ex instanceof JasperException) {
return (JasperException) ex;
diff --git a/java/org/apache/jasper/tagplugins/jstl/core/Import.java
b/java/org/apache/jasper/tagplugins/jstl/core/Import.java
index 5e9097f38b..a65063f113 100644
--- a/java/org/apache/jasper/tagplugins/jstl/core/Import.java
+++ b/java/org/apache/jasper/tagplugins/jstl/core/Import.java
@@ -158,7 +158,7 @@ public class Import implements TagPlugin {
ctxt.generateJavaSource(" try{");
ctxt.generateJavaSource(" " + tempReaderName + " = new
java.io.InputStreamReader(" +
inputStreamName + ", " + charSetName + ");");
- ctxt.generateJavaSource(" }catch(Exception ex){");
+ ctxt.generateJavaSource(" }catch(Exception e){");
ctxt.generateJavaSource(" " + tempReaderName + " = new
java.io.InputStreamReader(" +
inputStreamName + ",
org.apache.jasper.tagplugins.jstl.Util.DEFAULT_ENCODING);");
ctxt.generateJavaSource(" }");
@@ -306,8 +306,7 @@ public class Import implements TagPlugin {
ctxt.generateJavaSource(" try{");
ctxt.generateJavaSource(" " + tempReaderName + " = new
java.io.InputStreamReader(" +
inputStreamName + "," + charSetName + ");");
- ctxt.generateJavaSource(" }catch(Exception ex){");
- // ctxt.generateJavaSource(" throw new
JspTagException(ex.toString());");
+ ctxt.generateJavaSource(" }catch(Exception e){");
ctxt.generateJavaSource(" " + tempReaderName + " = new
java.io.InputStreamReader(" +
inputStreamName +
",org.apache.jasper.tagplugins.jstl.Util.DEFAULT_ENCODING);");
ctxt.generateJavaSource(" }");
diff --git a/java/org/apache/naming/factory/DataSourceLinkFactory.java
b/java/org/apache/naming/factory/DataSourceLinkFactory.java
index 2a2b3e0e54..5522a9a03d 100644
--- a/java/org/apache/naming/factory/DataSourceLinkFactory.java
+++ b/java/org/apache/naming/factory/DataSourceLinkFactory.java
@@ -66,21 +66,21 @@ public class DataSourceLinkFactory extends
ResourceLinkFactory {
DataSourceHandler handler = new DataSourceHandler((DataSource)
datasource, username, password);
return
Proxy.newProxyInstance(datasource.getClass().getClassLoader(),
datasource.getClass().getInterfaces(),
handler);
- } catch (Exception exception) {
- if (exception instanceof InvocationTargetException) {
- Throwable cause = exception.getCause();
+ } catch (Exception e) {
+ if (e instanceof InvocationTargetException) {
+ Throwable cause = e.getCause();
if (cause instanceof VirtualMachineError) {
throw (VirtualMachineError) cause;
}
if (cause instanceof Exception) {
- exception = (Exception) cause;
+ e = (Exception) cause;
}
}
- if (exception instanceof NamingException) {
- throw (NamingException) exception;
+ if (e instanceof NamingException) {
+ throw (NamingException) e;
} else {
- NamingException nx = new
NamingException(exception.getMessage());
- nx.initCause(exception);
+ NamingException nx = new NamingException(e.getMessage());
+ nx.initCause(e);
throw nx;
}
}
diff --git a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
index f805264125..d19e4192a2 100644
--- a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
+++ b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
@@ -372,8 +372,8 @@ public class BaseModelMBean implements DynamicMBean,
MBeanRegistration, ModelMBe
}
try {
sendAttributeChangeNotification(new Attribute(name, oldValue),
attribute);
- } catch (Exception ex) {
- log.error(sm.getString("baseModelMBean.notificationError", name),
ex);
+ } catch (Exception e) {
+ log.error(sm.getString("baseModelMBean.notificationError", name),
e);
}
// attributes.put( name, value );
// if( source != null ) {
diff --git a/java/org/apache/tomcat/util/modeler/Registry.java
b/java/org/apache/tomcat/util/modeler/Registry.java
index 80b42ba2a5..cc27f18d53 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -644,9 +644,9 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
}
getMBeanServer().registerMBean(mbean, oname);
- } catch (Exception ex) {
- log.error(sm.getString("registry.registerError", oname), ex);
- throw ex;
+ } catch (Exception e) {
+ log.error(sm.getString("registry.registerError", oname), e);
+ throw e;
}
}
@@ -681,7 +681,7 @@ public class Registry implements RegistryMBean,
MBeanRegistration {
searchedPaths.put(packageName, dURL);
try {
load("MbeansDescriptorsDigesterSource", dURL, null);
- } catch (Exception ex) {
+ } catch (Exception e) {
log.error(sm.getString("registry.loadError", dURL));
}
}
diff --git
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
index 9e959a092c..6a06a23d18 100644
---
a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
+++
b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
@@ -85,8 +85,8 @@ public class MbeansDescriptorsIntrospectionSource extends
ModelerSource {
registry.addManagedBean(managed);
- } catch (Exception ex) {
- log.error(sm.getString("modules.readDescriptorsError"), ex);
+ } catch (Exception e) {
+ log.error(sm.getString("modules.readDescriptorsError"), e);
}
}
@@ -321,8 +321,8 @@ public class MbeansDescriptorsIntrospectionSource extends
ModelerSource {
mbean.setName(type);
return mbean;
- } catch (Exception ex) {
- log.error(sm.getString("source.introspectionError",
realClass.getName()), ex);
+ } catch (Exception e) {
+ log.error(sm.getString("source.introspectionError",
realClass.getName()), e);
return null;
}
}
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 14e789294e..cfdf998cde 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1258,8 +1258,8 @@ public abstract class AbstractEndpoint<S, U> {
} else {
return IntrospectionUtils.setProperty(this, name, value,
false);
}
- } catch (Exception x) {
- getLog().error(sm.getString("endpoint.setAttributeError", name,
value), x);
+ } catch (Exception e) {
+ getLog().error(sm.getString("endpoint.setAttributeError", name,
value), e);
return false;
}
}
diff --git a/java/org/apache/tomcat/util/net/Acceptor.java
b/java/org/apache/tomcat/util/net/Acceptor.java
index 8e786eb719..84692fab3e 100644
--- a/java/org/apache/tomcat/util/net/Acceptor.java
+++ b/java/org/apache/tomcat/util/net/Acceptor.java
@@ -125,14 +125,14 @@ public class Acceptor<U> implements Runnable {
// Accept the next incoming connection from the server
// socket
socket = endpoint.serverSocketAccept();
- } catch (Exception ioe) {
+ } catch (Exception e) {
// We didn't get a socket
endpoint.countDownConnection();
if (endpoint.isRunning()) {
// Introduce delay if necessary
errorDelay = handleExceptionWithDelay(errorDelay);
// re-throw
- throw ioe;
+ throw e;
} else {
break;
}
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java
b/java/org/apache/tomcat/util/net/NioEndpoint.java
index c16806cf11..29d5337505 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -710,8 +710,8 @@ public class NioEndpoint extends
AbstractNetworkChannelEndpoint<NioChannel,Socke
} else if (interestOps == OP_REGISTER) {
try {
sc.register(getSelector(), SelectionKey.OP_READ,
socketWrapper);
- } catch (Exception x) {
- log.error(sm.getString("endpoint.nio.registerFail"),
x);
+ } catch (Exception e) {
+ log.error(sm.getString("endpoint.nio.registerFail"),
e);
}
} else {
final SelectionKey key = sc.keyFor(getSelector());
diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java
b/java/org/apache/tomcat/util/net/SSLUtilBase.java
index 484d0c7c29..a592b27532 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -237,9 +237,9 @@ public abstract class SSLUtilBase implements SSLUtil {
// May be expected when working with a trust store
// Re-throw. Caller will catch and log as required
throw ioe;
- } catch (Exception ex) {
- String msg = sm.getString("sslUtilBase.keystore_load_failed",
type, path, ex.getMessage());
- log.error(msg, ex);
+ } catch (Exception e) {
+ String msg = sm.getString("sslUtilBase.keystore_load_failed",
type, path, e.getMessage());
+ log.error(msg, e);
throw new IOException(msg);
} finally {
if (istream != null) {
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java
b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index 86b5289895..59216eb0e7 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -393,9 +393,9 @@ public class SecureNioChannel extends NioChannel {
} catch (IOException x) {
closeSilently();
throw x;
- } catch (Exception cx) {
+ } catch (Exception e) {
closeSilently();
- throw new IOException(cx);
+ throw new IOException(e);
} finally {
if (key != null) {
try {
diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
index d2591f519d..01b68798fc 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
@@ -125,8 +125,8 @@ public class JSSESupport implements SSLSupport,
SSLSessionManager {
CertificateFactory cf =
CertificateFactory.getInstance("X.509");
ByteArrayInputStream stream = new
ByteArrayInputStream(buffer);
x509Certs[i] = (X509Certificate)
cf.generateCertificate(stream);
- } catch (Exception ex) {
- log.info(sm.getString("jsseSupport.certTranslationError",
certs[i]), ex);
+ } catch (Exception e) {
+ log.info(sm.getString("jsseSupport.certTranslationError",
certs[i]), e);
return null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
