changeset 410:74e13553e3e3 dispose

change call do setKey in constractor
author tatsuki
date Sat, 05 Jul 2014 18:27:55 +0900
parents e501afa00369
children b42eee3348b2
files src/main/java/alice/topology/manager/IncomingHosts.java src/main/java/alice/topology/manager/StartTopologyManager.java
diffstat 2 files changed, 35 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/alice/topology/manager/IncomingHosts.java	Sat Jul 05 16:10:57 2014 +0900
+++ b/src/main/java/alice/topology/manager/IncomingHosts.java	Sat Jul 05 18:27:55 2014 +0900
@@ -12,38 +12,40 @@
 import alice.topology.HostMessage;
 
 public class IncomingHosts extends CodeSegment {
-	
-	HashMap<String, LinkedList<NodeInfo>> topology;
-	LinkedList<String> nodeNames;
-	Receiver host = ids.create(CommandType.TAKE);
-	
-	public IncomingHosts(HashMap<String, LinkedList<NodeInfo>> topology, LinkedList<String> nodeNames) {
-		this.topology = topology;
-		this.nodeNames = nodeNames;
-	}
+
+    HashMap<String, LinkedList<NodeInfo>> topology;
+    LinkedList<String> nodeNames;
+    Receiver host = ids.create(CommandType.TAKE);
+
+    public IncomingHosts(HashMap<String, LinkedList<NodeInfo>> topology,
+            LinkedList<String> nodeNames) {
+        this.topology = topology;
+        this.nodeNames = nodeNames;
+        this.host.setKey("local", "host");
+    }
 
-	@Override
-	public void run() {
-		HostMessage host = this.host.asClass(HostMessage.class);
-		String nodeName = nodeNames.poll();
-		// Manager connect to Node
-		DataSegment.connect(nodeName, "", host.name, host.port);
-		ods.put(nodeName, "host", nodeName);
-		LinkedList<NodeInfo> nodes = topology.get(nodeName);
-		for (NodeInfo nodeInfo : nodes) {
-			HostMessage newHost = new HostMessage(host.name, host.port, nodeInfo.connectionName, nodeInfo.reverseName);
-			ods.put("local", nodeInfo.sourceNodeName, newHost);
-		}
-		
-		if (nodeNames.isEmpty()) {
-			// configuration finish
-			for (String key : topology.keySet()) {
-				ods.put("local", key, ValueFactory.createNilValue());
-			}
-		} else {
-			IncomingHosts cs = new IncomingHosts(topology, nodeNames);
-			cs.host.setKey("local", "host");
-		}
-	}
+    @Override
+    public void run() {
+        HostMessage host = this.host.asClass(HostMessage.class);
+        String nodeName = nodeNames.poll();
+        // Manager connect to Node
+        DataSegment.connect(nodeName, "", host.name, host.port);
+        ods.put(nodeName, "host", nodeName);
+        LinkedList<NodeInfo> nodes = topology.get(nodeName);
+        for (NodeInfo nodeInfo : nodes) {
+            HostMessage newHost = new HostMessage(host.name, host.port,
+                    nodeInfo.connectionName, nodeInfo.reverseName);
+            ods.put("local", nodeInfo.sourceNodeName, newHost);
+        }
+
+        if (nodeNames.isEmpty()) {
+            // configuration finish
+            for (String key : topology.keySet()) {
+                ods.put("local", key, ValueFactory.createNilValue());
+            }
+        } else {
+            new IncomingHosts(topology, nodeNames);
+        }
+    }
 
 }
--- a/src/main/java/alice/topology/manager/StartTopologyManager.java	Sat Jul 05 16:10:57 2014 +0900
+++ b/src/main/java/alice/topology/manager/StartTopologyManager.java	Sat Jul 05 18:27:55 2014 +0900
@@ -76,8 +76,7 @@
 				e.printStackTrace();
 			}
 
-			IncomingHosts cs1 = new IncomingHosts(topology, nodeNames);
-			cs1.host.setKey("local", "host");
+			new IncomingHosts(topology, nodeNames);
 
 			ConfigWaiter cs3 = new ConfigWaiter(nodeNum);
 			cs3.done.setKey("local", "done");