# HG changeset patch
# User Yu Taninari <you@cr.ie.u-ryukyu.ac.jp>
# Date 1314785280 -32400
# Node ID 7aea720eb4853eac90b2f447cbde8fc288baf34b
# Parent  2eb52d563a05b81d1bcea4f347d69fed1aca6941# Parent  a542f92500ab94fc8773942772e61afd25c33d90
merge

diff -r 2eb52d563a05 -r 7aea720eb485 src/myVncClient/EchoClient.java
--- a/src/myVncClient/EchoClient.java	Wed Aug 31 19:06:36 2011 +0900
+++ b/src/myVncClient/EchoClient.java	Wed Aug 31 19:08:00 2011 +0900
@@ -174,19 +174,22 @@
 				 * if ((value.treenum = is.readLine()) != null) {
 				 * System.out.println("treenum: " + value.treenum); }
 				 */
-				Thread.sleep(1000);
-				client.init();
-				client.setEchoValue(this);
-				client.getParentName();
-				client.start_threads();
-				client.start();
-//				MyVncClient.main(this);
+				
+				if(!(checkRepetition.equals("skip"))) {
+					Thread.sleep(1000);
+					client.init();
+					client.setEchoValue(this);
+					client.getParentName();
+					client.start_threads();
+					client.start();
+					//				MyVncClient.main(this);
 
-				// 開いたソケットなどをクローズ
-				os.close();
-				is.close();
-				echoSocket.close();
-				//runflag = true;
+					// 開いたソケットなどをクローズ
+					os.close();
+					is.close();
+					echoSocket.close();
+					//runflag = true;
+				}
 
 			} catch (UnknownHostException e) {
 				System.err.println("Trying to connect to unknown host: " + e);
diff -r 2eb52d563a05 -r 7aea720eb485 src/myVncClient/MyRfbProto.java
--- a/src/myVncClient/MyRfbProto.java	Wed Aug 31 19:06:36 2011 +0900
+++ b/src/myVncClient/MyRfbProto.java	Wed Aug 31 19:08:00 2011 +0900
@@ -791,8 +791,8 @@
 						writerRunning.set(2);
 						os.close();
 					} catch (IOException e1) {
+						/* if socket closed 	cliList.remove(newCli); */
 					}
-					/* if socket closed 	cliList.remove(newCli); */
 				}
 			}