FIX: Make sure to create readonly copy of locator that has same shape with original one.

Author: uhm0311

src/main/java/net/spy/memcached/ArcusKetamaNodeLocator.java

@@ -175,31 +175,28 @@ public Iterator<MemcachedNode> getSequence(String k) {
   }
 
   public NodeLocator getReadonlyCopy() {
-    TreeMap<Long, SortedSet<MemcachedNode>> smn =
-            new TreeMap<>(ketamaNodes);
-    Collection<MemcachedNode> an = new ArrayList<>(
-            allNodes.size());
-
     lock.lock();
     try {
+      TreeMap<Long, SortedSet<MemcachedNode>> ketamaCopy = new TreeMap<>();
+      Collection<MemcachedNode> nodesCopy = new ArrayList<>(allNodes.size());
+
       // Rewrite the values a copy of the map.
-      for (Map.Entry<Long, SortedSet<MemcachedNode>> me : smn.entrySet()) {
-        SortedSet<MemcachedNode> nodeROSet =
-                new TreeSet<>(config.new NodeNameComparator());
-        for (MemcachedNode mn : me.getValue()) {
-          nodeROSet.add(new MemcachedNodeROImpl(mn));
+      for (Map.Entry<Long, SortedSet<MemcachedNode>> hashPoint : ketamaNodes.entrySet()) {
+        SortedSet<MemcachedNode> nodeROSet = new TreeSet<>(config.new NodeNameComparator());
+        for (MemcachedNode node : hashPoint.getValue()) {
+          nodeROSet.add(new MemcachedNodeROImpl(node));
         }
-        me.setValue(nodeROSet);
+        ketamaCopy.put(hashPoint.getKey(), nodeROSet);
       }
       // Copy the allNodes collection.
-      for (MemcachedNode n : allNodes) {
-        an.add(new MemcachedNodeROImpl(n));
+      for (MemcachedNode node : allNodes) {
+        nodesCopy.add(new MemcachedNodeROImpl(node));
       }
+
+      return new ArcusKetamaNodeLocator(ketamaCopy, nodesCopy, config);
     } finally {
       lock.unlock();
     }
-
-    return new ArcusKetamaNodeLocator(smn, an, config);
   }
 
   public void update(Collection<MemcachedNode> toAttach,

src/main/java/net/spy/memcached/ArcusReplKetamaNodeLocator.java

@@ -205,36 +205,34 @@ public Iterator<MemcachedNode> getSequence(String k, ReplicaPick pick) {
   }
 
   public NodeLocator getReadonlyCopy() {
-    TreeMap<Long, SortedSet<MemcachedReplicaGroup>> smg =
-            new TreeMap<>(ketamaGroups);
-    HashMap<String, MemcachedReplicaGroup> ag =
-            new HashMap<>(allGroups.size());
-    Collection<MemcachedNode> an = new ArrayList<>(allNodes.size());
-
     lock.lock();
     try {
+      TreeMap<Long, SortedSet<MemcachedReplicaGroup>> ketamaCopy = new TreeMap<>();
+      HashMap<String, MemcachedReplicaGroup> groupsCopy = new HashMap<>(allGroups.size());
+      Collection<MemcachedNode> nodesCopy = new ArrayList<>(allNodes.size());
+
       // Rewrite the values a copy of the map
-      for (Map.Entry<Long, SortedSet<MemcachedReplicaGroup>> mge : smg.entrySet()) {
+      for (Map.Entry<Long, SortedSet<MemcachedReplicaGroup>> hashPoint : ketamaGroups.entrySet()) {
         SortedSet<MemcachedReplicaGroup> groupROSet = new TreeSet<>(
                 new ArcusReplKetamaNodeLocatorConfiguration.MemcachedReplicaGroupComparator());
-        for (MemcachedReplicaGroup mrg : mge.getValue()) {
-          groupROSet.add(new MemcachedReplicaGroupROImpl(mrg));
+        for (MemcachedReplicaGroup group : hashPoint.getValue()) {
+          groupROSet.add(new MemcachedReplicaGroupROImpl(group));
         }
-        mge.setValue(groupROSet);
+        ketamaCopy.put(hashPoint.getKey(), groupROSet);
       }
       // copy the allGroups collection.
-      for (Map.Entry<String, MemcachedReplicaGroup> me : allGroups.entrySet()) {
-        ag.put(me.getKey(), new MemcachedReplicaGroupROImpl(me.getValue()));
+      for (Map.Entry<String, MemcachedReplicaGroup> group : allGroups.entrySet()) {
+        groupsCopy.put(group.getKey(), new MemcachedReplicaGroupROImpl(group.getValue()));
       }
       // copy the allNodes collection.
-      for (MemcachedNode n : allNodes) {
-        an.add(new MemcachedNodeROImpl(n));
+      for (MemcachedNode node : allNodes) {
+        nodesCopy.add(new MemcachedNodeROImpl(node));
       }
+
+      return new ArcusReplKetamaNodeLocator(ketamaCopy, groupsCopy, nodesCopy);
     } finally {
       lock.unlock();
     }
-
-    return new ArcusReplKetamaNodeLocator(smg, ag, an);
   }
 
   public void update(Collection<MemcachedNode> toAttach, Collection<MemcachedNode> toDelete) {