Fxi https://issues.apache.org/bugzilla/show_bug.cgi?id=49127

Don't swallow exceptions unnecessarily

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@964216 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java b/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
index d3951a3..241cd87 100644 (file)
--- a/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
+++ b/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
@@ -520,7 +520,7 @@ public class SimpleTcpReplicationManager extends StandardManager implements Clus
                 do {
                     try {
                         Thread.sleep(100);
-                    }catch ( Exception sleep) {}
+                    } catch (InterruptedException sleep) { /* Ignore */ }
                     reqNow = System.currentTimeMillis();
                     isTimeout=((reqNow-reqStart)>(1000*60));
                 } while ( (!isStateTransferred()) && (!isTimeout));

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fb337fe..ca701f7 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -190,6 +190,10 @@
   <subsection name="Cluster">
     <changelog>
       <fix>
+        <bug>49127</bug>: Don't swallow exceptions unnecessarily in
+        <code>SimpleTcpReplicationManager.startInternal()</code>. (markt)
+      </fix>
+      <fix>
         <bug>49445</bug>: When session ID is changed after authentication,
         ensure the DeltaManager replicates the change in ID to the other nodes
         in the cluster. (kfujino)