# HG changeset patch # User one # Date 1258976379 -32400 # Node ID c001797f3fdb0d09c95bfa47773ca4c82ba08255 # Parent 04bd4ae97e7c462e5d964b8fcde4939253a1c94d connect bug fix diff -r 04bd4ae97e7c -r c001797f3fdb src/fdl/test/topology/NodeManager.java --- a/src/fdl/test/topology/NodeManager.java Sun Nov 22 13:59:05 2009 +0900 +++ b/src/fdl/test/topology/NodeManager.java Mon Nov 23 20:39:39 2009 +0900 @@ -62,6 +62,17 @@ } } } + for (int i = 0; i < waitingNodes.size(); i++) { + NodeManager node = waitingNodes.get(i); + if (node.isRunning()) { + connect(node); + finishConnection(node); + if (node.waitingNodes.contains(this)) { + node.connect(this); + node.finishConnection(this); + } + } + } } public void connect(NodeManager node) { diff -r 04bd4ae97e7c -r c001797f3fdb src/fdl/test/topology/ring/RingMetaProtocolEngine.java --- a/src/fdl/test/topology/ring/RingMetaProtocolEngine.java Sun Nov 22 13:59:05 2009 +0900 +++ b/src/fdl/test/topology/ring/RingMetaProtocolEngine.java Mon Nov 23 20:39:39 2009 +0900 @@ -2,7 +2,7 @@ import java.io.IOException; import java.nio.ByteBuffer; -import java.text.SimpleDateFormat; +//import java.text.SimpleDateFormat; import java.util.Date; import fdl.MetaLinda; @@ -24,7 +24,7 @@ private int relayNum; private static int relayId = 10; private Date startTime, endTime; - private SimpleDateFormat DF = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss.SSS"); + //private SimpleDateFormat DF = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss.SSS"); public RingMetaProtocolEngine(MetaLinda ml, String managerHostName, int relayNum) { super(ml, managerHostName); this.relayNum = relayNum; diff -r 04bd4ae97e7c -r c001797f3fdb src/fdl/test/topology/ring/RingTopologyManagerEngine.java --- a/src/fdl/test/topology/ring/RingTopologyManagerEngine.java Sun Nov 22 13:59:05 2009 +0900 +++ b/src/fdl/test/topology/ring/RingTopologyManagerEngine.java Mon Nov 23 20:39:39 2009 +0900 @@ -2,8 +2,6 @@ import java.io.IOException; import java.nio.ByteBuffer; -import java.text.SimpleDateFormat; -import java.util.Date; import fdl.MetaLinda; import fdl.PSXReply;