# HG changeset patch # User Shinji KONO # Date 1402223418 -32400 # Node ID 41f049cebcb5d01aadbfb20f9a131b5a27eb74d8 # Parent 81b558b38b9ff0522b7714872e2bd95326ef8e59 remove unnecessary EchoClient finally diff -r 81b558b38b9f -r 41f049cebcb5 src/main/java/jp/ac/u_ryukyu/treevnc/TReeVNCCommand.java --- a/src/main/java/jp/ac/u_ryukyu/treevnc/TReeVNCCommand.java Sun Jun 08 19:23:50 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TReeVNCCommand.java Sun Jun 08 19:30:18 2014 +0900 @@ -119,11 +119,7 @@ * @param hostname */ private void handleLostParent(int port, String hostname) { - try { - viewer.fixLostParent(hostname,port); - } catch (IOException e) { - // log - } + viewer.fixLostParent(hostname,port); } /** diff -r 81b558b38b9f -r 41f049cebcb5 src/main/java/jp/ac/u_ryukyu/treevnc/server/CreateThread.java --- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/CreateThread.java Sun Jun 08 19:23:50 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,81 +0,0 @@ -package jp.ac.u_ryukyu.treevnc.server; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.PrintStream; -import java.net.BindException; -import java.net.ServerSocket; -import java.net.Socket; - -public class CreateThread implements Runnable { - ServerSocket echoServer; - AcceptClient acceptClient; - private int port; - private boolean stopFlag; - - public CreateThread(AcceptClient _acc) { - acceptClient = _acc; - port = 9999; - } - - - void newEchoClient(final BufferedReader is,final PrintStream os) { - Runnable echoSender = new Runnable() { - public void run() { - acceptClient.transferParentAddrerss(is,os); - } - }; - new Thread(echoSender).start(); - } - - void selectPort(int p) { - int port = p; - while (true) { - try { - initServSock(port); - break; - } catch (BindException e) { - port++; - continue; - } catch (IOException e) { - - } - } - System.out.println("accept Echo port = " + port); - } - - void initServSock(int port) throws IOException { - echoServer = new ServerSocket(port); - this.port = port; - } - - public int getPort() { - return port; - } - - - public void run() { - selectPort(port); - - while (true) { - try { -// echoServer = new ServerSocket(9999); - Socket clientSocket = echoServer.accept(); - if(stopFlag) break; - BufferedReader is = new BufferedReader(new InputStreamReader( - clientSocket.getInputStream())); - PrintStream os = new PrintStream(clientSocket.getOutputStream()); - newEchoClient(is,os); -// acceptClient.transferParentAddrerss(is, os); - } catch (IOException e) { - System.out.println(e); - } - } - - } - public void setStopFlag(boolean flag){ - stopFlag = flag; - } - -} diff -r 81b558b38b9f -r 41f049cebcb5 src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java --- a/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java Sun Jun 08 19:23:50 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/server/VncProxyService.java Sun Jun 08 19:30:18 2014 +0900 @@ -83,13 +83,6 @@ isApplet = true; run(); createConnectionAndStart(); - try { - threadSetAndStart(); - } catch (UnknownHostException e) { - - } catch (IOException e) { - - } } /** @@ -155,12 +148,6 @@ closeApp(); } - private void threadSetAndStart() throws UnknownHostException, IOException { - CreateThread createThread = new CreateThread(clients); - Thread thread = new Thread(createThread); - thread.start(); - } - protected void socketClose() { }