X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=TD2%2Fserver%2FBroadcastThreadService.java;h=cd971c252356d34b4821c6e170ec81aa462d6c46;hb=da31e6daf7553c6b38ca83c428dd02a3aa8af853;hp=180f735b49fa442ed5982afa0a286d8c3f0ff879;hpb=b9a33c97f77a1eae45b91426ca8061e18f163d4e;p=TD_SR.git

diff --git a/TD2/server/BroadcastThreadService.java b/TD2/server/BroadcastThreadService.java
index 180f735..cd971c2 100644
--- a/TD2/server/BroadcastThreadService.java
+++ b/TD2/server/BroadcastThreadService.java
@@ -18,9 +18,7 @@ public class BroadcastThreadService implements Runnable {
 	public void run() {
 		try {
 			doService(clientSocket, listWriter);
-			//FIXME: also close the BR and PW?
 			clientSocket.close();
-			//FIXME: remove the associated PW from the ArrayList
 		} catch (IOException e) {
 			System.err.println("IOException : " + e);
 			e.printStackTrace();
@@ -36,17 +34,31 @@ public class BroadcastThreadService implements Runnable {
 		}
 	}
 
+	/**
+	 * Be careful, this function must be thread-safe
+	 * @param  clientSocket [description]
+	 * @param  sharedList   [description]
+	 * @throws IOException  [description]
+	 */
 	public void doService(Socket clientSocket, ArrayList<PrintWriter> sharedList) throws IOException {
 		BufferedReader in;
 		in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
-		sharedList.add(new PrintWriter(clientSocket.getOutputStream()));
+		PrintWriter OWriter = new PrintWriter(clientSocket.getOutputStream());
+		sharedList.add(OWriter);
 		boolean end = false;
 		while (!end) {
 			String theLine = in.readLine();
-			if (theLine.equals("."))
+			if (theLine.equals(".")) {
 				end = true; // le thread de service doit terminer
+				break; // do not broadcast the dot that will close all clients threads
+			}
 			broadcastMsg(theLine);
 		}
+		sharedList.remove(OWriter);
+		if (in != null)
+			in.close();
+		if (OWriter != null)
+			OWriter.close();
 		System.out.println("Fin du thread repondant au client, port "
 		 					+ clientSocket.getPort());
 	}