Author: kfujino
Date: Mon Apr 23 02:57:35 2012
New Revision: 1329045
URL: http://svn.apache.org/viewvc?rev=1329045&view=rev
Log:
Make sure complete message takes priority over access message.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1329045&r1=1329044&r2=1329045&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Mon Apr 23 02:57:35 2012
@@ -439,13 +439,7 @@ 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(),
@@ -453,6 +447,12 @@ public abstract class AbstractReplicated
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 ) {
if (rentry != null)
rentry.setLastTimeReplicated(System.currentTimeMillis());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
