### Eclipse Workspace Patch 1.0 #P org.eclipse.rse.connectorservice.telnet Index: src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java =================================================================== RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.telnet/src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java,v retrieving revision 1.12 diff -u -r1.12 TelnetConnectorService.java --- src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java 27 Jun 2007 08:21:11 -0000 1.12 +++ src/org/eclipse/rse/internal/connectorservice/telnet/TelnetConnectorService.java 27 Jun 2007 13:50:23 -0000 @@ -67,8 +67,6 @@ private static final int TELNET_CONNECT_TIMEOUT = 60; //seconds - TODO: Make configurable private List fTelnetClients = new ArrayList(); private SessionLostHandler fSessionLostHandler; - private InputStream in; - private PrintStream out; private IPropertySet telnetPropertySet = null; private static final int ERROR_CODE = 100; // filed error code private static final int SUCCESS_CODE = 150; // login pass code @@ -148,11 +146,8 @@ password = ssi.getPassword(); } - in = client.getInputStream(); - out = new PrintStream(client.getOutputStream()); - long millisToEnd = System.currentTimeMillis() + TELNET_CONNECT_TIMEOUT*1000; - LoginThread checkLogin = new LoginThread(user, password); + LoginThread checkLogin = new LoginThread(user, password,client.getInputStream(),new PrintStream( client.getOutputStream() )); checkLogin.start(); while (checkLogin.isAlive() && System.currentTimeMillis() 0) { - status = readUntil(login_prompt); - write(username); + status = readUntil(login_prompt,this.in); + write(username,this.out); } if (status == SUCCESS_CODE && password_prompt != null && password_prompt.length() > 0) { - status = readUntil(password_prompt); - write(password); + status = readUntil(password_prompt,this.in); + write(password,this.out); } if (status == SUCCESS_CODE && command_prompt != null && command_prompt.length() > 0) { - status = readUntil(command_prompt); + status = readUntil(command_prompt,this.in); } } else { if (command_prompt != null && command_prompt.length() > 0) { - status = readUntil(command_prompt); + status = readUntil(command_prompt,this.in); } } }