From: Chad B. <cwb...@us...> - 2005-05-27 17:47:11
|
User: cwbrandon Date: 05/05/27 10:47:04 Modified: src/java/org/andromda/core/server DefaultClient.java Log: cleanup unused code Revision Changes Path 1.3 +2 -8 andromda/src/java/org/andromda/core/server/DefaultClient.java Index: DefaultClient.java =================================================================== RCS file: /cvsroot/andromda/andromda/src/java/org/andromda/core/server/DefaultClient.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- DefaultClient.java 27 May 2005 17:16:59 -0000 1.2 +++ DefaultClient.java 27 May 2005 17:47:04 -0000 1.3 @@ -2,9 +2,7 @@ import org.andromda.core.configuration.Configuration; -import java.io.BufferedReader; import java.io.DataInputStream; -import java.io.InputStreamReader; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -36,7 +34,7 @@ { Socket server = null; ObjectOutputStream out = null; - BufferedReader serverInput = null; + ObjectInputStream objectInput = null; final String host = serverConfiguration.getHost(); try { @@ -44,17 +42,14 @@ host, serverConfiguration.getPort()); out = new ObjectOutputStream(server.getOutputStream()); - serverInput = new BufferedReader(new InputStreamReader(server.getInputStream())); + objectInput = new ObjectInputStream(new DataInputStream(server.getInputStream())); } catch (final UnknownHostException exception) { throw new RuntimeException("Can't connect to host '" + host + "'"); } out.writeObject(configuration); - final ObjectInputStream objectInput = new ObjectInputStream(new DataInputStream( - server.getInputStream())); final Object input = objectInput.readObject(); - //Object input = serverInput.readLine(); while (input == null); if (input instanceof Throwable) { @@ -63,7 +58,6 @@ objectInput.close(); out.flush(); out.close(); - serverInput.close(); server.close(); } catch (final ConnectException exception) |
From: Chad B. <cwb...@us...> - 2005-08-18 23:26:53
|
User: cwbrandon Date: 05/08/17 15:08:13 Modified: src/java/org/andromda/core/server DefaultClient.java Log: get rid of bogus loop Revision Changes Path 1.7 +0 -2 andromda/src/java/org/andromda/core/server/DefaultClient.java Index: DefaultClient.java =================================================================== RCS file: /cvsroot/andromda/andromda/src/java/org/andromda/core/server/DefaultClient.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -r1.6 -r1.7 --- DefaultClient.java 24 Jul 2005 21:55:19 -0000 1.6 +++ DefaultClient.java 17 Aug 2005 22:08:12 -0000 1.7 @@ -77,8 +77,6 @@ if (object instanceof Configuration) { final Object input = objectInput.readObject(); - while (input == null) - ; if (input instanceof Throwable) { throw new ClientException((Throwable)input); |