Author: kfujino
Date: Fri Apr 9 08:41:22 2010
New Revision: 932300
URL: http://svn.apache.org/viewvc?rev=932300&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49051
memberAlive is not called if member has not already existed in membership.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=932300&r1=932299&r2=932300&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Apr 9 08:41:22 2010
@@ -297,12 +297,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49051
- memberAlive is not called if member has not already existed in membership.
- http://svn.apache.org/viewvc?view=revision&revision=931061
- +1: kfujino, markt, kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49018
Fix processing of time argument in the "Expire sessions" action in the
Manager web application.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=932300&r1=932299&r2=932300&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Fri Apr 9 08:41:22 2010
@@ -141,6 +141,11 @@ public class TcpFailureDetector extends
if(log.isInfoEnabled())
log.info("Received memberDisappeared["+member+"] message. Will
verify.");
synchronized (membership) {
+ if (!membership.contains(member)) {
+ if(log.isInfoEnabled())
+ log.info("Verification complete. Member already
disappeared["+member+"]");
+ return;
+ }
//check to see if the member really is gone
//if the payload is not a shutdown message
if (shutdown || !memberAlive(member)) {
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=932300&r1=932299&r2=932300&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Apr 9 08:41:22 2010
@@ -60,6 +60,14 @@
</add>
</changelog>
</subsection>
+ <subsection name="Cluster">
+ <changelog>
+ <fix>
+ <bug>49051</bug>: memberAlive is not called if member has not already
+ existed in membership. (kfujino)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>Update to Commons Daemon 1.0.2. Use service launcher (procrun)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
