git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 4.7.1
[fanfix.git]
/
src
/
be
/
nikiroo
/
utils
/
serial
/
server
/
Server.java
diff --git
a/src/be/nikiroo/utils/serial/server/Server.java
b/src/be/nikiroo/utils/serial/server/Server.java
index 2022469a0296387f90bc5aca40005d4b2981849c..afceaf95323ec349825372c858b65fc95f185761 100644
(file)
--- 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);
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);
}
} else {
s = new Socket(host, port);
}
@@
-388,7
+391,10
@@
abstract class Server implements Runnable {
ServerSocket ss;
if (ssl) {
ss = SSLServerSocketFactory.getDefault().createServerSocket(port);
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);
}
} else {
ss = new ServerSocket(port);
}