Author: kfujino
Date: Wed Nov 25 05:42:01 2015
New Revision: 1716306
URL: http://svn.apache.org/viewvc?rev=1716306&view=rev
Log:
When using a static cluster, add the members that have been cached in the
membership service to the map members list in order to ensure that the map
member is a static member.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1716306&r1=1716305&r2=1716306&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Nov 25 05:42:01 2015
@@ -734,9 +734,10 @@ public abstract class AbstractReplicated
if ( member.equals(getChannel().getLocalMember(false)) ) return;
boolean memberAdded = false;
//select a backup node if we don't have one
+ Member mapMember = getChannel().getMember(member);
synchronized (mapMembers) {
- if (!mapMembers.containsKey(member) ) {
- mapMembers.put(member,
Long.valueOf(System.currentTimeMillis()));
+ if (!mapMembers.containsKey(mapMember) ) {
+ mapMembers.put(mapMember,
Long.valueOf(System.currentTimeMillis()));
memberAdded = true;
}
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1716306&r1=1716305&r2=1716306&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Nov 25 05:42:01 2015
@@ -103,6 +103,11 @@
Correct the warnnig log of when the member that is not registered in
the
membership is detected. (kfujino)
</fix>
+ <fix>
+ When using a static cluster, add the members that have been cached in
+ the membership service to the map members list in order to ensure that
+ the map member is a static member. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="jdbc-pool">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
