Handle some Exceptions caused eg. by missing network during shutdown

Author: Martin Lehmann

lib/src/main/java/xyz/gianlu/librespot/core/Session.java

@@ -452,6 +452,8 @@ private void authenticatePartial(@NotNull Authentication.LoginCredentials creden
     public void close() throws IOException {
         LOGGER.info("Closing session. {deviceId: {}}", inner.deviceId);
 
+        if (scheduledReconnect != null) scheduledReconnect.cancel(true);
+
         closing = true;
 
         scheduler.shutdownNow();
@@ -513,7 +515,11 @@ public void close() throws IOException {
     }
 
     private void sendUnchecked(Packet.Type cmd, byte[] payload) throws IOException {
-        cipherPair.sendEncoded(conn.out, cmd.val, payload);
+        try {
+        	cipherPair.sendEncoded(conn.out, cmd.val, payload);
+        } catch (NullPointerException e) {
+            throw new IOException(e);
+        }
     }
 
     private void waitAuthLock() {
@@ -692,6 +698,7 @@ public Configuration configuration() {
     }
 
     private void reconnect() {
+        if (!this.closing) {
         synchronized (reconnectionListeners) {
             reconnectionListeners.forEach(ReconnectionListener::onConnectionDropped);
         }
@@ -715,15 +722,18 @@ private void reconnect() {
             synchronized (reconnectionListeners) {
                 reconnectionListeners.forEach(ReconnectionListener::onConnectionEstablished);
             }
-        } catch (IOException | GeneralSecurityException | SpotifyAuthenticationException ex) {
-            conn = null;
-            LOGGER.error("Failed reconnecting, retrying in 10 seconds...", ex);
-
-            try {
-                scheduler.schedule(this::reconnect, 10, TimeUnit.SECONDS);
-            } catch (RejectedExecutionException exx) {
-                LOGGER.info("Scheduler already shutdown, stopping reconnection", exx);
-            }
+            } catch (NullPointerException | IOException | GeneralSecurityException | SpotifyAuthenticationException ex) {
+                if (!this.closing) {
+		            conn = null;
+		            LOGGER.error("Failed reconnecting, retrying in 10 seconds...", ex);
+		
+		            try {
+		                scheduler.schedule(this::reconnect, 10, TimeUnit.SECONDS);
+		            } catch (RejectedExecutionException exx) {
+		                LOGGER.info("Scheduler already shutdown, stopping reconnection", exx);
+		            }
+		        }
+		    }
         }
     }
 
@@ -1309,16 +1319,16 @@ public void run() {
                         LOGGER.info("Skipping unknown command {cmd: 0x{}, payload: {}}", Integer.toHexString(packet.cmd), Utils.bytesToHex(packet.payload));
                         continue;
                     }
-                } catch (IOException | GeneralSecurityException ex) {
-                    if (running) {
+                } catch (IOException | GeneralSecurityException | NullPointerException ex) {
+                    if (running && !closing) {
                         LOGGER.error("Failed reading packet!", ex);
                         reconnect();
                     }
 
                     break;
                 }
 
-                if (!running) break;
+                if (!running || closing) break;
 
                 switch (cmd) {
                     case Ping:

player/src/main/java/xyz/gianlu/librespot/player/state/DeviceStateHandler.java

@@ -44,6 +44,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.*;
+import java.util.concurrent.RejectedExecutionException;
 
 /**
  * @author Gianlu
@@ -226,7 +227,11 @@ public synchronized void updateState(@NotNull Connect.PutStateReason reason, int
                 .setClientSideTimestamp(TimeProvider.currentTimeMillis())
                 .getDeviceBuilder().setDeviceInfo(deviceInfo).setPlayerState(state);
 
-        putStateWorker.submit(putState.build());
+        try {
+        	putStateWorker.submit(putState.build());
+        } catch (RejectedExecutionException e){
+            LOGGER.debug("Failed to update state, ignoring.", e);
+        }
     }
 
     public synchronized int getVolume() {