changeset 42:129e999a2aa3

merge
author Yu Taninari <you@cr.ie.u-ryukyu.ac.jp>
date Sat, 09 Jul 2011 12:58:33 +0900
parents 1b5d30103205 (diff) 672e7582bcce (current diff)
children 15e64e9154b5 539d09923e4b
files
diffstat 2 files changed, 34 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/myVncClient/MyVncClient.java	Sat Jul 09 01:28:01 2011 +0900
+++ b/src/myVncClient/MyVncClient.java	Sat Jul 09 12:58:33 2011 +0900
@@ -4,6 +4,7 @@
 import java.awt.event.*;
 import java.io.*;
 import java.net.*;
+import java.util.Random;
 
 import myVncClient.acceptThread;
 
@@ -117,10 +118,26 @@
 
 		} catch (IOException e) {
 			System.out.println("Socket error");
-			System.exit(0);
+			// parent no find
+			Random rnd = new Random();
+			int ran = rnd.nextInt(500) + 500;
+
+			while (true) {
+				try {
+					Thread.sleep(ran);
+				} catch (InterruptedException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+
+					echo = new echoClient();
+					echo.openport();
+					echo.losthost();
+				}
+			}
+			// System.exit(0);
 		} catch (Exception e) {
 			System.out.println(e);
-			System.exit(0);			
+			System.exit(0);
 		}
 
 		gbc.weightx = 1.0;
@@ -178,20 +195,28 @@
 			vncFrame.setVisible(false);
 			vncFrame = null;
 			// リーダーの子ノードがproxyに対して親が落ちたことを報告をする
+			if(echoClient.value.leaderflag != null){
+				echo = new echoClient();
+				echo.openport();
+				echo.losthost();
+			/*
 			if ("1".equals(echoClient.value.leaderflag)) {
 				echo = new echoClient();
 				echo.openport();
 				echo.losthost();
 			} else if ("0".equals(echoClient.value.leaderflag)) {
+				
 				try {
 					Thread.sleep(1000);
 				} catch (InterruptedException e1) {
 					// TODO Auto-generated catch block
 					e1.printStackTrace();
 				}
+
 				echo = new echoClient();
 				echo.openport();
 				echo.losthost();
+				*/
 			} else {
 
 				if (showOfflineDesktop) {
@@ -670,7 +695,7 @@
 
 		if (value == null) {
 			if (clientSocket == null) {
-				echo = new echoClient(host);
+				echo = new echoClient(mainArgs[0]);
 				echo.openport();
 				
 				value = echo.hostn("1");
--- a/src/myVncClient/echoClient.java	Sat Jul 09 01:28:01 2011 +0900
+++ b/src/myVncClient/echoClient.java	Sat Jul 09 12:58:33 2011 +0900
@@ -38,8 +38,7 @@
 				echoSocket = new Socket("133.13.48.18", 9999);
 			}
 			os = new DataOutputStream(echoSocket.getOutputStream());
-			is = new BufferedReader(new InputStreamReader(
-					echoSocket.getInputStream()));
+			is = new BufferedReader(new InputStreamReader(echoSocket.getInputStream()));
 		} catch (UnknownHostException e) {
 			System.err.println("Don't know about host: localhost");
 		} catch (IOException e) {
@@ -64,7 +63,7 @@
 
 	/**
 	 * @param args
-	 *            select first connection or other
+	 *            select at first connection or other
 	 * @return
 	 */
 	Revalue hostn(String args) {
@@ -140,7 +139,7 @@
 				 * if ((value.treenum = is.readLine()) != null) {
 				 * System.out.println("treenum: " + value.treenum); }
 				 */
-				Thread.sleep(1000);
+				//Thread.sleep(1000);
 				MyVncClient.main(value);
 
 				// 開いたソケットなどをクローズ
@@ -152,11 +151,12 @@
 				System.err.println("Trying to connect to unknown host: " + e);
 			} catch (IOException e) {
 				System.err.println("IOException: " + e);
-			} catch (InterruptedException e) {
+			} 
+			/*catch (InterruptedException e) {
 				// TODO Auto-generated catch block in order to thread sleep
 				e.printStackTrace();
 			}
-
+*/
 		}
 		return value;
 	}