# HG changeset patch # User nobuyasu # Date 1312699798 -32400 # Node ID 5dba59a88d2516dd3393aadae3f2052a721b8375 # Parent 2ff8d5a226c9c3927d85081acb091dbd116dcf8f# Parent 94df4d2bc5fe4ed4cd0d3e241a69c79445c307bf merge diff -r 2ff8d5a226c9 -r 5dba59a88d25 src/myVncProxy/AcceptClient.java --- a/src/myVncProxy/AcceptClient.java Sun Aug 07 15:47:52 2011 +0900 +++ b/src/myVncProxy/AcceptClient.java Sun Aug 07 15:49:58 2011 +0900 @@ -147,7 +147,7 @@ checkParameter(parentnum, counter, leaderflag); } else { // treeの親ノードに接続する人に接続する人を教える - outputStream(os, name, "0", + outputStream(os, add, "0", String.valueOf(counter), leaderflag); } Thread.sleep(intv_time);