From 8b4e5cbe816a1bbfccbbe22a82723d700b50a772 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 15 Jan 2011 14:47:07 +0000
Subject: [PATCH] Fix broken cluster membership recovery

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1059346 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/tribes/membership/McastServiceImpl.java | 4 ++--
 webapps/docs/changelog.xml                                       | 5 +++++
 webapps/docs/config/cluster-membership.xml                       | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
index c8aeca687..b6ef6c21b 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -547,7 +547,7 @@ public class McastServiceImpl
                             try { Thread.sleep(500); } catch ( Exception ignore ){}
                             if ( (++errorCounter)>=recoveryCounter ) {
                                 errorCounter=0;
-                                new RecoveryThread(McastServiceImpl.this);
+                                new RecoveryThread(McastServiceImpl.this).start();
                             }
                         }
                     }
@@ -575,7 +575,7 @@ public class McastServiceImpl
                     else log.debug("Unable to send mcast message.",x);
                     if ( (++errorCounter)>=recoveryCounter ) {
                         errorCounter=0;
-                        new RecoveryThread(McastServiceImpl.this);
+                        new RecoveryThread(McastServiceImpl.this).start();
                     }
                 }
                 try { Thread.sleep(time); } catch ( Exception ignore ) {}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 73835bfb0..7f9ae9985 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -83,6 +83,11 @@
       <add>
         Internationalise the log messages for the FarmWarDeployer. (markt)
       </add>
+      <fix>
+        The recovery feature of the default cluster membership service can now
+        be enabled. Previously it any configuration settings for it were
+        ignored. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">
diff --git a/webapps/docs/config/cluster-membership.xml b/webapps/docs/config/cluster-membership.xml
index c477f298e..1a623dd6a 100644
--- a/webapps/docs/config/cluster-membership.xml
+++ b/webapps/docs/config/cluster-membership.xml
@@ -138,8 +138,9 @@
     </attribute>
     <attribute name="recoveryCounter" required="false">
       <p>
-      When <code>recoveryEnabled==true</code> this value indicates how many times we will try recovery.
-      The default is <code>10</code>. <br/>
+      When <code>recoveryEnabled==true</code> this value indicates how many
+      times an error has to occur before recovery is attempted. The default is
+      <code>10</code>. <br/>
       </p>
     </attribute>
     <attribute name="recoverySleepTime" required="false">
-- 
2.11.0