Several fixes.

Prepare for Socket-Revision.

Author: eluchsinger

Client/src/main/java/controllers/networking/streaming/music/TCPMusicStreamingService.java

@@ -91,7 +91,8 @@ public void start() {
             this.setCurrentServiceStatus(ServiceStatus.WAITING);
         } catch (IOException exception) {
             this.running = false;
-            Logger.getLogger(this.getClass().getName()).log(Level.SEVERE, "Starting Streaming Service", exception);
+            Logger.getLogger(this.getClass().getName())
+                    .log(Level.SEVERE, "Starting Streaming Service", exception);
         }
     }
 
@@ -112,6 +113,18 @@ public void stop() {
         } finally {
             if (this.listeningThread == null || !this.listeningThread.isAlive())
                 this.setCurrentServiceStatus(ServiceStatus.STOPPED);
+
+            // Close the socket.
+            if(this.getSocket() != null) {
+                try {
+                    if(!this.getSocket().isClosed())
+                        this.getSocket().close();
+                } catch (IOException e) {
+                    Logger.getLogger(this.getClass().getName())
+                            .log(Level.SEVERE,
+                                    "Error closing the open socket", e);
+                }
+            }
         }
     }
 
@@ -192,25 +205,34 @@ private synchronized Socket getSocket() {
      * @throws IOException
      */
     private synchronized void setSocket(Socket socket) throws IOException {
-        this.socket = socket;
 
-        if(this.socket != null) {
-            if (!this.socket.isInputShutdown()) {
-                this.currentOIS =
-                        new ObjectInputStream(socket.getInputStream());
+        // Change only if the socket really changed.
+        // (By Reference)
+        if(this.socket != socket) {
+            // If the socket is not null, close it first!
+            if(this.socket != null && !this.socket.isClosed()) {
+                this.socket.close();
+            }
+
+            this.socket = socket;
+
+            if (this.socket != null) {
+                if (!this.socket.isInputShutdown()) {
+                    this.currentOIS =
+                            new ObjectInputStream(socket.getInputStream());
+                } else {
+                    if (this.currentOIS != null) {
+                        this.currentOIS.close();
+                        this.currentOIS = null;
+                    }
+                }
             } else {
                 if (this.currentOIS != null) {
                     this.currentOIS.close();
                     this.currentOIS = null;
                 }
             }
         }
-        else {
-            if(this.currentOIS != null) {
-                this.currentOIS.close();
-                this.currentOIS = null;
-            }
-        }
     }
 
     /**

Client/src/main/java/viewmodels/ClientWindowViewModel.java

@@ -37,7 +37,6 @@ public class ClientWindowViewModel {
 
     private MediaPlayer mediaPlayer;
 
-    private ServiceStatus lastStatus = ServiceStatus.STOPPED;
 
     /**
      * Constructor
@@ -67,10 +66,8 @@ public void setStage(Stage stage) {
 
         if(this.stage != null){
             this.stage.setOnCloseRequest(event -> {
-
                 this.musicStreamingService.stop();
                 this.discoveryService.stop();
-
             });
         }
     }

Server/src/main/java/controllers/networking/discovery/DiscoveryService.java

@@ -86,7 +86,7 @@ public class DiscoveryService {
     /**
      * This boolean controls the finishing of the
      * responseThread. If the thread is started, it is set to true.
-     * If the isListening is set to false, the thread will stop (probable delay: DiscoveryService.READING_TIMEOUT)
+     * If the isListening is set to false, the thread will stopPlaying (probable delay: DiscoveryService.READING_TIMEOUT)
      */
     private volatile boolean isListening = false;
 

Server/src/main/java/controllers/networking/streaming/music/MusicStreamController.java

@@ -12,5 +12,5 @@ public interface MusicStreamController {
      * @param song Song to stream.
      */
     void play(Song song);
-    void stop();
+    void stopPlaying();
 }

Server/src/main/java/controllers/networking/streaming/music/TCPMusicStreamController.java

@@ -6,11 +6,13 @@
 import models.networking.dtos.StopCommand;
 import models.songs.Song;
 
+import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.net.SocketException;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -22,7 +24,7 @@
 /**
  * Created by Esteban Luchsinger on 07.03.2016.
  */
-public class TCPMusicStreamController implements MusicStreamController {
+public class TCPMusicStreamController implements MusicStreamController, Closeable {
 
     /**
      * The destination port for datagrams sent to the clients.
@@ -35,6 +37,9 @@ public class TCPMusicStreamController implements MusicStreamController {
      */
     private final static int TIMEOUT_FOR_RESPONSES = 1000;
 
+    /**
+     * Server TCP Socket.
+     */
     private ServerSocket serverSocket;
 
     /**
@@ -49,6 +54,8 @@ public class TCPMusicStreamController implements MusicStreamController {
      */
     private List<NetworkClient> connections;
 
+    private boolean isStopped;
+
     /**
      * Starts the service.
      * @throws IOException
@@ -59,6 +66,7 @@ public TCPMusicStreamController() throws IOException {
         this.connectionAcceptingThread = new Thread(this::acceptConnections);
         this.connectionAcceptingThread.setDaemon(true);
         this.connectionAcceptingThread.start();
+        this.isStopped = false;
     }
 
     /**
@@ -88,10 +96,10 @@ public void play(Song song) {
     }
 
     /**
-     * Sends a stop command to the connected clients.
+     * Sends a Stop command to the connected clients.
      */
     @Override
-    public void stop() {
+    public void stopPlaying() {
         try {
             synchronized (this.connections) {
                 Iterator<NetworkClient> iterator = this.connections.iterator();
@@ -107,6 +115,13 @@ public void stop() {
         }
     }
 
+    /**
+     * Stops the TCPStreaming Service and frees the Sockets and Data.
+     * ALWAYS call this method, when the Service is not needed.
+     */
+    public void stop() throws IOException {
+    }
+
     /**
      * Returns the data of the song.
      * @param song
@@ -129,7 +144,13 @@ private void acceptConnections() {
             socket.setKeepAlive(true);
             socket.setReuseAddress(true);
             this.connections.add(new NetworkClient(socket));
-        } catch (IOException e) {
+        } catch (SocketException socketException) {
+            if(socketException.getMessage().equals("socket closed")) {
+                Logger.getLogger(this.getClass().getName())
+                        .log(Level.INFO, "Socket closed", socketException);
+            }
+        }
+        catch (IOException e) {
             Logger.getLogger(this.getClass().getName())
                     .log(Level.WARNING, "Error accepting connection", e);
         }
@@ -160,4 +181,28 @@ private static Socket prepareSocket(Socket originalSocket) throws IOException {
     private synchronized ServerSocket getServerSocket(){
         return this.serverSocket;
     }
+
+    /**
+     * Closes this stream and releases any system resources associated
+     * with it. If the stream is already closed then invoking this
+     * method has no effect.
+     * <p>
+     * <p> As noted in {@link AutoCloseable#close()}, cases where the
+     * close may fail require careful attention. It is strongly advised
+     * to relinquish the underlying resources and to internally
+     * <em>mark</em> the {@code Closeable} as closed, prior to throwing
+     * the {@code IOException}.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    public void close() throws IOException {
+        if(this.getServerSocket() != null && !this.getServerSocket().isClosed()) {
+            this.getServerSocket().close();
+        }
+
+        for(NetworkClient networkClient : this.connections) {
+            networkClient.close();
+        }
+    }
 }

Server/src/main/java/controllers/networking/streaming/music/UDPMusicStreamController.java

@@ -65,7 +65,7 @@ public void play(Song song) {
     }
 
     @Override
-    public void stop() {
+    public void stopPlaying() {
         throw new RuntimeException("Not Implemented method");
     }
 

Server/src/main/java/models/NetworkClient.java

@@ -48,6 +48,8 @@ public ObjectOutputStream getOutputStream() {
      * Closes the NetworkClient.
      */
     public void close() throws IOException {
-        this.outputStream.close();
+        if(this.getSocket() != null && !this.getSocket().isClosed()) {
+            this.socket.close();
+        }
     }
 }

Server/src/main/java/viewmodels/MainWindowViewModel.java

@@ -6,11 +6,9 @@
 import controllers.networking.discovery.DiscoveryService;
 import controllers.networking.streaming.music.MusicStreamController;
 import controllers.networking.streaming.music.TCPMusicStreamController;
-import controllers.networking.streaming.music.UDPMusicStreamController;
 import javafx.application.Platform;
 import javafx.stage.Stage;
 import models.clients.Client;
-import models.clients.Clients;
 import models.songs.Song;
 import utils.DurationStringConverter;
 import javafx.beans.binding.Bindings;
@@ -24,9 +22,12 @@
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.stage.DirectoryChooser;
 
+import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Created by Esteban Luchsinger on 30.11.2015.
@@ -143,6 +144,15 @@ public void setStage(Stage stage) {
                 if(this.discoveryService != null) {
                     this.discoveryService.stop();
                     System.out.println("Stopped Discovery Service!");
+                    if(this.musicStreamController instanceof Closeable) {
+                        try {
+                            ((Closeable)this.musicStreamController).close();
+                        } catch (IOException e) {
+                            Logger.getLogger(this.getClass().getName())
+                                    .log(Level.SEVERE, "Could not close the StreamController!",
+                                            e);
+                        }
+                    }
                 }
             });
         }
@@ -218,7 +228,7 @@ public void onIsPlayingChanged() {
         } else {
             this.buttonPlayPause.setId("play-button");
             this.buttonPlayPause.setSelected(false);
-            this.musicStreamController.stop();
+            this.musicStreamController.stopPlaying();
         }
     }
     //endregion