From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 14 Jul 2010 21:39:40 +0000 (+0000)
Subject: Fxi https://issues.apache.org/bugzilla/show_bug.cgi?id=49127
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ec8ddf183e9aae9061d18d7dc91dc660750abf43;p=tomcat7.0

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 d3951a3d4..241cd87ed 100644
--- 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 fb337fe26..ca701f7c3 100644
--- 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)