Author: kfujino Date: Wed May 13 02:06:49 2015 New Revision: 1679127 URL: http://svn.apache.org/r1679127 Log: Ensure that the state transfer flag is updated to true only when the map states have been transferred correctly from existing map members.
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=1679127&r1=1679126&r2=1679127&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 May 13 02:06:49 2015 @@ -495,6 +495,7 @@ public abstract class AbstractReplicated messageReceived( (Serializable) list.get(i), resp[0].getSource()); } //for } + stateTransferred = true; } else { log.warn("Transfer state, 0 replies, probably a timeout."); } @@ -506,7 +507,6 @@ public abstract class AbstractReplicated } catch (ClassNotFoundException x) { log.error("Unable to transfer LazyReplicatedMap state.", x); } - stateTransferred = 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=1679127&r1=1679126&r2=1679127&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed May 13 02:06:49 2015 @@ -107,6 +107,15 @@ </fix> </changelog> </subsection> + <subsection name="Tribes"> + <changelog> + <fix> + Ensure that the state transfer flag is updated to true only when the map + states have been transferred correctly from existing map members. + (kfujino) + </fix> + </changelog> + </subsection> <subsection name="Other"> <changelog> <update> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org