more fixes, same bz

http://issues.apache.org/bugzilla/show_bug.cgi?id=43053

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@564360 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index 9b97d8e..e82e977 100644 (file)
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -732,6 +732,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements
                         entry.getBackupNodes().length == 1 &&
                         entry.getBackupNodes()[0].equals(channel.getLocalMember(false)) ) {
                 try {
+                    entry.setPrimary(channel.getLocalMember(false));
                     Member[] backup = publishEntryInfo(entry.getKey(), entry.getValue());
                     entry.setBackupNodes(backup);
                 } catch (ChannelException x) {
@@ -840,7 +841,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements
                         getChannel().send(dest, msg, getChannelSendOptions());
                     }
                 }
-
+                entry.setPrimary(channel.getLocalMember(false));
                 entry.setBackupNodes(backup);
                 entry.setBackup(false);
                 entry.setProxy(false);