Author: rjung
Date: Tue Aug 24 13:23:46 2010
New Revision: 988532
URL: http://svn.apache.org/viewvc?rev=988532&view=rev
Log:
BZ 49127: Don't swallow exceptions unnecessarily in
SimpleTcpReplicationManager.startInternal().
Backport of r964216 from trunk.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=988532&r1=988531&r2=988532&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Aug 24 13:23:46 2010
@@ -32,6 +32,10 @@
<section name="Tomcat OACC 0.1 (rjung)">
<subsection name="Cluster">
<fix>
+ <bug>49127</bug>: Don't swallow exceptions unnecessarily in
+ <code>SimpleTcpReplicationManager.startInternal()</code>. (rjung)
+ </fix>
+ <fix>
Remove unwanted line breaks from MBean descriptors. (rjung)
</fix>
<fix>
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java?rev=988532&r1=988531&r2=988532&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Tue Aug 24 13:23:46 2010
@@ -481,7 +481,7 @@ implements ClusterManager
do {
try {
Thread.sleep(100);
- }catch ( Exception sleep) {}
+ } catch (InterruptedException sleep) { /* Ignore */ }
reqNow = System.currentTimeMillis();
isTimeout=((reqNow-reqStart)>(1000*60));
} while ( (!isStateTransferred()) && (!isTimeout));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
