Author: kfujino
Date: Thu Apr 19 02:17:01 2012
New Revision: 1327781
URL: http://svn.apache.org/viewvc?rev=1327781&view=rev
Log:
Apply Konstantin's suggestion.
"if (diff && (isDirty || complete))" block was executed regardless of the value
of "complete".
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=1327781&r1=1327780&r2=1327781&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Thu Apr 19 02:17:01 2012
@@ -406,10 +406,11 @@ public abstract class AbstractReplicated
if ( entry == null ) return;
if ( !entry.isSerializable() ) return;
if (entry.isPrimary() && entry.getBackupNodes()!= null &&
entry.getBackupNodes().length > 0) {
- Object value = entry.getValue();
//check to see if we need to replicate this object
isDirty()||complete || isAccessReplicate()
- boolean isDirty = ((value instanceof ReplicatedMapEntry) &&
((ReplicatedMapEntry) value).isDirty());
- boolean isAccess = ((value instanceof ReplicatedMapEntry) &&
((ReplicatedMapEntry) value).isAccessReplicate());
+ ReplicatedMapEntry rentry = null;
+ if (entry.getValue() instanceof ReplicatedMapEntry) rentry =
(ReplicatedMapEntry)entry.getValue();
+ boolean isDirty = rentry != null && rentry.isDirty();
+ boolean isAccess = rentry != null && rentry.isAccessReplicate();
boolean repl = complete || isDirty || isAccess;
if (!repl) {
@@ -419,10 +420,9 @@ public abstract class AbstractReplicated
return;
}
//check to see if the message is diffable
- boolean diff = ((value instanceof ReplicatedMapEntry) &&
((ReplicatedMapEntry) value).isDiffable());
+ boolean diff = rentry != null && rentry.isDiffable();
MapMessage msg = null;
- if (diff && isDirty) {
- ReplicatedMapEntry rentry =
(ReplicatedMapEntry)entry.getValue();
+ if (diff && (isDirty || complete)) {
try {
rentry.lock();
//construct a diff message
@@ -455,9 +455,7 @@ public abstract class AbstractReplicated
}
try {
if ( channel!=null && entry.getBackupNodes()!= null &&
entry.getBackupNodes().length > 0 ) {
- if ((entry.getValue() instanceof ReplicatedMapEntry)) {
-
((ReplicatedMapEntry)entry.getValue()).setLastTimeReplicated(System.currentTimeMillis());
- }
+ if (rentry != null)
rentry.setLastTimeReplicated(System.currentTimeMillis());
channel.send(entry.getBackupNodes(), msg,
channelSendOptions);
}
} catch (ChannelException x) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
