Mercurial > hg > Database > Alice

changeset 438:c973f7ee7c91 dispose

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring
author sugi
date Wed, 20 Aug 2014 15:54:20 +0900
parents b9fd22d9f6c5
children 9f6674e503df
files src/main/java/alice/topology/manager/IncomingHosts.java src/main/java/alice/topology/manager/StartTopologyManager.java
diffstat 2 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/alice/topology/manager/IncomingHosts.java	Mon Aug 18 15:54:53 2014 +0900
+++ b/src/main/java/alice/topology/manager/IncomingHosts.java	Wed Aug 20 15:54:20 2014 +0900
@@ -22,7 +22,7 @@
     public IncomingHosts() {
         this.topology.setKey("resultParse");
         this.nodeNames.setKey("nodeNames");
-        this.host.setKey("host");
+        this.host.setKey("newHost");
         this.absCookieTable.setKey("absCookieTable");
         this.cookie.setKey("MD5");
     }
@@ -72,7 +72,7 @@
         
         ods.put(this.nodeNames.key, nodeNames);
         ods.put(this.topology.key, topology);
-        ods.put("orderHash", "order");
+        
         new IncomingHosts();
     }
 }
--- a/src/main/java/alice/topology/manager/StartTopologyManager.java	Mon Aug 18 15:54:53 2014 +0900
+++ b/src/main/java/alice/topology/manager/StartTopologyManager.java	Wed Aug 20 15:54:20 2014 +0900
@@ -29,6 +29,9 @@
 
     @Override
     public void run() {
+        new CheckComingHost();
+        ods.put("absCookieTable", new HashMap<String, String>());
+        
         if (!conf.extendTopology) {
             LinkedList<String> nodeNames = new LinkedList<String>();
             HashMap<String, LinkedList<NodeInfo>> topology = new HashMap<String, LinkedList<NodeInfo>>();
@@ -81,7 +84,7 @@
             ods.put("running", false);
             ods.put("resultParse", topology);
             ods.put("nodeNames", nodeNames);
-            ods.put("orderHash", "order");
+            
             new IncomingHosts();
 
             ConfigWaiter cs3 = new ConfigWaiter(nodeNum);
@@ -89,8 +92,7 @@
             
         } else {
             ods.put("running", true);
-            new CheckComingHost();
-            
+             
             HashMap<String,HostMessage> parentInfo = new HashMap<String,HostMessage>();
             int cominghostCount = 0;
             ods.put("nodeConnectionInfo", parentInfo);
@@ -98,8 +100,7 @@
             new ComingServiceHosts();
         }
 
-        ods.put("topology", new HashMap<String, LinkedList<HostMessage>>());
-        ods.put("absCookieTable", new HashMap<String, String>());
+        ods.put("topology", new HashMap<String, LinkedList<HostMessage>>());       
         ods.put("createdList", new LinkedList<String>());
         new CreateHash();
     }