Mercurial > hg > Database > Alice

diff src/main/java/alice/topology/fix/FixTopology.java @ 496:f82f259ea93b dispose

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
putConnectionInfo only called from keepAlive deamon
author sugi
date Fri, 12 Dec 2014 05:29:31 +0900
parents 24e535123df7
children 5adb0f530e3d
line wrap: on
line diff
--- a/src/main/java/alice/topology/fix/FixTopology.java	Thu Dec 11 18:28:18 2014 +0900
+++ b/src/main/java/alice/topology/fix/FixTopology.java	Fri Dec 12 05:29:31 2014 +0900
@@ -15,14 +15,12 @@
 
     private Receiver info = ids.create(CommandType.TAKE); // disconnection nodeInfo
     private Receiver info1 = ids.create(CommandType.TAKE); // all connection Info
-    private Receiver info2 = ids.create(CommandType.TAKE); // node count
     private Receiver info3 = ids.create(CommandType.TAKE); // IP Table
     private Receiver info4 = ids.create(CommandType.TAKE); // parentManager
 
     public FixTopology() {
         info.setKey("_DISCONNECTNODE");
         info1.setKey("topology");
-        info2.setKey("hostCount");
         info3.setKey("nameTable");
         info4.setKey("parentManager");
     }
@@ -51,8 +49,7 @@
             // change state not Alive
             lostNode.alive = false;
             // get lastJoinedNode
-            int last = info2.asInteger()-1;
-            String lastJoinNodeName = "node"+last;
+            String lastJoinNodeName = manager.getLastNode().getName();
             LinkedList<HostMessage> connectionList = topology.get(lastJoinNodeName);
             // lastJoinedNode has one connection
             HostMessage parentNode = connectionList.poll();
@@ -132,7 +129,6 @@
         }
 
         ods.put(info1.key, topology);
-        ods.put(info2.key, info2.getReceiveData());
         ods.put(info3.key, nameTable);
         ods.put(info4.key, manager);
     }