X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServer.java;h=afceaf95323ec349825372c858b65fc95f185761;hb=0988831f084e27de9927c1bb29e338e9263bfa42;hp=2022469a0296387f90bc5aca40005d4b2981849c;hpb=59864f77f0b8d5a57f479152a3131093544af6b2;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/server/Server.java b/src/be/nikiroo/utils/serial/server/Server.java
index 2022469..afceaf9 100644
--- a/src/be/nikiroo/utils/serial/server/Server.java
+++ b/src/be/nikiroo/utils/serial/server/Server.java
@@ -293,13 +293,13 @@ abstract class Server implements Runnable {
 					}
 				}
 			}
+		}
 
-			// only return when stopped
-			while (started || exiting) {
-				try {
-					Thread.sleep(10);
-				} catch (InterruptedException e) {
-				}
+		// return only when stopped
+		while (started || exiting) {
+			try {
+				Thread.sleep(10);
+			} catch (InterruptedException e) {
 			}
 		}
 	}
@@ -357,7 +357,10 @@ abstract class Server implements Runnable {
 		Socket s;
 		if (ssl) {
 			s = SSLSocketFactory.getDefault().createSocket(host, port);
-			((SSLSocket) s).setEnabledCipherSuites(ANON_CIPHERS);
+			if (s instanceof SSLSocket) {
+				// Should always be the case
+				((SSLSocket) s).setEnabledCipherSuites(ANON_CIPHERS);
+			}
 		} else {
 			s = new Socket(host, port);
 		}
@@ -388,7 +391,10 @@ abstract class Server implements Runnable {
 		ServerSocket ss;
 		if (ssl) {
 			ss = SSLServerSocketFactory.getDefault().createServerSocket(port);
-			((SSLServerSocket) ss).setEnabledCipherSuites(ANON_CIPHERS);
+			if (ss instanceof SSLServerSocket) {
+				// Should always be the case
+				((SSLServerSocket) ss).setEnabledCipherSuites(ANON_CIPHERS);
+			}
 		} else {
 			ss = new ServerSocket(port);
 		}