moved socket close to finally block, removed sleep()

Author: Sandy W

client/ClientThread.java

@@ -20,50 +20,44 @@ public class ClientThread extends Thread {
 
 	public void run() {
 		PrintWriter out = null;
-        BufferedReader in = null;
-        try
-        {
-                //creates a new Socket object and names it socket.
-                //Establishes the socket connection between the client & server
-                //name of the machine & the port number to which we want to connect
-                socket = new Socket(hostName, 4000);
-                System.out.print("Establishing connection.");            
-                out = new PrintWriter(socket.getOutputStream(), true);//opens a PrintWriter 
-                                                                        //on the socket
+		BufferedReader in = null;
+		try {
+			//creates a new Socket object and names it socket.
+			//Establishes the socket connection between the client & server
+			//name of the machine & the port number to which we want to connect
+			socket = new Socket(hostName, 4000);
+			System.out.print("Establishing connection.");            
+			out = new PrintWriter(socket.getOutputStream(), true);//opens a PrintWriter 
+										//on the socket
 
-                //opens a BufferedReader on the socket
-                in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-                System.out.println("\nRequesting output for the '" + menuSelection + "' command from " + hostName);
-                // send the command to the server
-                for (int i = 0; i < 25; i++) {
-			out.println(Integer.toString(menuSelection));
-			out.flush();
-		}
-                System.out.println("Sent output");
-                // read the command from the server
-                String outputString = "hi";
-                while (((outputString = in.readLine()) != null) && (!outputString.equals("END_MESSAGE"))) {
-                        System.out.println(threadNum + " " + outputString);
-                }
-                System.out.println("closing");
-                try {
-					sleep(500);
-				} catch (InterruptedException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-                socket.close();
+			//opens a BufferedReader on the socket
+			in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+			System.out.println("\nRequesting output for the '" + menuSelection + "' command from " + hostName);
+	
+			// send the command to the server
+			for (int i = 0; i < 25; i++) {
+				out.println(Integer.toString(menuSelection));
+				out.flush();
+			}
+			System.out.println("Sent output");
 
-        }
-        catch (UnknownHostException e)
-        {
-                System.err.println("Unknown host: " + e);
-                System.exit(1);
-        }
-        catch (IOException e)
-        {
-                e.printStackTrace();
-        }
+			// read the command from the server
+			String outputString = "";
+			while (((outputString = in.readLine()) != null) && (!outputString.equals("END_MESSAGE"))) {
+				System.out.println(threadNum + " " + outputString);
+			}
+		}
+		catch (UnknownHostException e) {
+			System.err.println("Unknown host: " + e);
+			System.exit(1);
+		}
+		catch (IOException e) {
+			e.printStackTrace();
+		}
+		finally {
+			System.out.println("closing");
+			socket.close();
+		}
 
 	}