Fixed errors when closing the application.

Author: eluchsinger

Server/src/main/java/controllers/clients/ClientController.java

@@ -8,12 +8,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.Closeable;
+import java.io.IOException;
+
 
 /**
  * Created by Esteban Luchsinger on 26.03.2016.
  * This controller handles the clients connected to the server.
  */
-public class ClientController {
+public class ClientController implements Closeable{
     private final Logger logger;
     private final ObservableList<NetworkClient> clients;
 
@@ -60,4 +63,23 @@ public ObservableList<NetworkClient> getClients() {
         return this.clients;
     }
 
+    /**
+     * 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 {
+        for(NetworkClient client : this.getClients()) {
+            client.close();
+        }
+    }
 }

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

@@ -161,12 +161,14 @@ public void setStage(Stage stage) {
                 if(this.serverDiscoveryService != null) {
                     this.serverDiscoveryService.stop();
                     this.logger.info("Stopped Discovery Service!");
-                    if(this.musicStreamController != null && this.musicStreamController instanceof Closeable) {
-                        try {
-                            ((Closeable)this.musicStreamController).close();
-                        } catch (IOException e) {
-                            this.logger.error("Could not close the StreamController", e);
-                        }
+
+                }
+
+                if(this.musicStreamController != null && this.musicStreamController instanceof Closeable) {
+                    try {
+                        ((Closeable)this.musicStreamController).close();
+                    } catch (IOException e) {
+                        this.logger.error("Could not close the StreamController", e);
                     }
                 }
 
@@ -177,6 +179,14 @@ public void setStage(Stage stage) {
                         this.logger.error("Could not close TCP Server", e);
                     }
                 }
+
+                if(this.clientController != null) {
+                    try {
+                        this.clientController.close();
+                    } catch (IOException e) {
+                        this.logger.error("Could not close client controller", e);
+                    }
+                }
             });
         }
     }
@@ -206,9 +216,22 @@ public void onButtonPlayPauseClicked() {
 
         if (this.mediaPlayer.isPlaying()) {
             this.mediaPlayer.pause();
+            this.musicStreamController.stop();
         } else if (this.getSelectedSong() != null) {
             this.logger.info("Trying to play: " + this.getSelectedSong().getTitle());
-            this.mediaPlayer.play(this.getSelectedSong(), true);
+
+            if(this.getSelectedSong() != null) {
+                // Start streaming...
+                this.logger.info("Streaming the new song: " + this.getSelectedSong().getTitle());
+                try {
+                    this.musicStreamController.play(this.getSelectedSong());
+                    this.mediaPlayer.play(this.getSelectedSong(), true);
+                }
+                catch(IOException ioException) {
+                    this.logger.error("Error trying to stream", ioException);
+                }
+            }
+
         }
     }
 
@@ -251,20 +274,9 @@ public void onIsPlayingChanged() {
             this.buttonPlayPause.setId("pause-button");
             this.buttonPlayPause.setSelected(true);
 
-            if(this.getSelectedSong() != null) {
-                // Start streaming...
-                this.logger.info("Streaming the new song: " + this.getSelectedSong().getTitle());
-                try {
-                    this.musicStreamController.play(this.getSelectedSong());
-                }
-                catch(IOException ioException) {
-                    this.logger.error("Error trying to stream", ioException);
-                }
-            }
         } else {
             this.buttonPlayPause.setId("play-button");
             this.buttonPlayPause.setSelected(false);
-            this.musicStreamController.stop();
         }
     }
     //endregion