Updating all files

Author: samshuster

src/.DS_Store

@@ -36,9 +36,11 @@ private void haveChat(){
 				line = this.inputStream.readLine();
 				outputStream.writeUTF(line);
 				outputStream.flush();
-				String inline = otherInputStream.readLine();
-				if(!inline.equals("")){
-					System.out.println(inline);
+				synchronized(otherInputStream){
+					String inline = otherInputStream.readLine();
+					if(!inline.equals("")){
+						System.out.println(inline);
+					}
 				}
 			} catch(IOException ioe){
 				System.out.println("Error: " + ioe.getMessage());

src/ChatClient.java

@@ -38,7 +38,7 @@ private void start() {
 	}
 
 	private void close() throws IOException {
-		helper.close();
+		helper.interrupt();
 		if (service != null) {
 			service.close();
 		}
@@ -54,13 +54,13 @@ private void close() throws IOException {
 	 */
 	public void run() {
 		// TODO Auto-generated method stub
+		boolean done = false;
 		try {
-			boolean done = false;
 			while (!done) {
-				try {
+					System.out.println("Waiting...");
+					helper.join();
 					List<Connection> conns = helper.getConnections();
-					System.out.println(done);
-					synchronized(conns){
+					System.out.println(conns);
 						List<String> text = new ArrayList<String>();
 						for(int i=0; i<conns.size(); i++){
 							Connection curr = conns.get(i);
@@ -70,8 +70,8 @@ public void run() {
 								conns.set(i, null);
 							} else {
 								DataInputStream input = curr.getInputStream();
-								line = input.readUTF();
-								System.out.println(line);
+								//line = input.readUTF();
+								//System.out.println(line);
 							}
 							text.add(line);
 							System.out.println(text);
@@ -91,18 +91,16 @@ public void run() {
 								}
 							}
 						}
-					}
-
-				} catch (IOException ioe) {
-					done = true;
-					System.out.println("IOException... exiting");
-				}
+					helper.start();
 			}
 			close();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+			} catch (IOException ioe) {
+				done = true;
+				System.out.println("IOException... exiting");
+			} catch (InterruptedException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 	}
 
 	public static void main(String args[]) {

src/ChatServer.java

@@ -8,46 +8,54 @@
 
 public class ChatServerHelper implements Runnable{
 
-	public Thread thread = null;
+	private Thread thread = null;
 	private List<Connection> connList = null;
 	private ServerSocket service = null;
-	private boolean stopServer = false;
 
 	public ChatServerHelper(ServerSocket service){
 		this.service = service;
 		connList = new ArrayList<Connection>();
-		if (thread == null) {
-			thread = new Thread(this);
-			thread.start();
-		}
+		this.start();
 	}
 
 	@Override
 	public void run() {
 		// TODO Auto-generated method stub
-		while (!stopServer) {
 			try {
 				System.out.println("Looking for new socket");
 				Socket newSocket = service.accept();
 				Connection newConnection = new Connection(newSocket);
-				synchronized (connList) {
-					connList.add(newConnection);
-				}
+				connList.add(newConnection);
 			} catch (SocketTimeoutException e) {
 
 			} catch (IOException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-		}
+		System.out.println("Done looking for new socket");
 	}
 
-	public List<Connection> getConnections(){
+	public synchronized List<Connection> getConnections(){
 		return connList;
 	}
 
-	public void close(){
-		stopServer = true;
+	public void interrupt(){
+		if(thread!=null){
+			thread.interrupt();
+		}
+	}
+	
+	public void join() throws InterruptedException{
+		if(thread!=null){
+			thread.join();
+		}
+	}
+	
+	public void start(){
+		if (thread == null || !thread.isAlive()) {
+			thread = new Thread(this);
+			thread.start();
+		}
 	}
 
 }

src/ChatServerHelper.java

@@ -22,11 +22,11 @@ public Connection(Socket socket){
 		}
 	}
 
-	public DataInputStream getInputStream(){
+	public synchronized DataInputStream getInputStream(){
 		return streamIn;
 	}
 
-	public DataOutputStream getOutputStream(){
+	public synchronized DataOutputStream getOutputStream(){
 		return streamOut;
 	}