You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kf...@apache.org on 2012/04/23 04:59:06 UTC
svn commit: r1329046 -
/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Author: kfujino
Date: Mon Apr 23 02:59:05 2012
New Revision: 1329046
URL: http://svn.apache.org/viewvc?rev=1329046&view=rev
Log:
Make sure complete message takes priority over access message.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1329046&r1=1329045&r2=1329046&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Mon Apr 23 02:59:05 2012
@@ -434,19 +434,18 @@ public abstract class AbstractReplicated
}
}
- if (msg == null && isAccess) {
- //construct a access message
- msg = new MapMessage(mapContextName, MapMessage.MSG_ACCESS,
- false, (Serializable) entry.getKey(), null, null, entry.getPrimary(),
- entry.getBackupNodes());
- }
- if (msg == null) {
+ if (msg == null && complete) {
//construct a complete
msg = new MapMessage(mapContextName, MapMessage.MSG_BACKUP,
false, (Serializable) entry.getKey(),
(Serializable) entry.getValue(),
null, entry.getPrimary(),entry.getBackupNodes());
-
+ }
+ if (msg == null) {
+ //construct a access message
+ msg = new MapMessage(mapContextName, MapMessage.MSG_ACCESS,
+ false, (Serializable) entry.getKey(), null, null, entry.getPrimary(),
+ entry.getBackupNodes());
}
try {
if ( channel!=null && entry.getBackupNodes()!= null && entry.getBackupNodes().length > 0 ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org