From ec8ddf183e9aae9061d18d7dc91dc660750abf43 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 14 Jul 2010 21:39:40 +0000 Subject: [PATCH] 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 --- java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java | 2 +- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 @@ + 49127: Don't swallow exceptions unnecessarily in + SimpleTcpReplicationManager.startInternal(). (markt) + + 49445: When session ID is changed after authentication, ensure the DeltaManager replicates the change in ID to the other nodes in the cluster. (kfujino) -- 2.11.0