Don't shutdown the ssl executor service too early (TooTallNate#331)

bendem · marci4 · commit d6de24f3be21 · 2017-03-15T17:16:35.000+01:00
The ExecutorService held by the DefaultSSLWebSocketServerFactory was being
shutdown when the first SSLSocketChannel2 got closed, making it unusable
for further connections. It's now being closed on server stop instead.
diff --git a/src/main/java/org/java_websocket/SSLSocketChannel2.java b/src/main/java/org/java_websocket/SSLSocketChannel2.java
@@ -308,7 +308,6 @@ public void close() throws IOException {
 		if( socketChannel.isOpen() )
 			socketChannel.write( wrap( emptybuffer ) );// FIXME what if not all bytes can be written
 		socketChannel.close();
-		exec.shutdownNow();
 	}
 
 	private boolean isHandShakeComplete() {
diff --git a/src/main/java/org/java_websocket/server/DefaultSSLWebSocketServerFactory.java b/src/main/java/org/java_websocket/server/DefaultSSLWebSocketServerFactory.java
@@ -48,4 +48,8 @@ public WebSocketImpl createWebSocket( WebSocketAdapter a, Draft d, Socket c ) {
 	public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> d, Socket s ) {
 		return new WebSocketImpl( a, d );
 	}
+	@Override
+	public void close() {
+		exec.shutdown();
+	}
 }
diff --git a/src/main/java/org/java_websocket/server/DefaultWebSocketServerFactory.java b/src/main/java/org/java_websocket/server/DefaultWebSocketServerFactory.java
@@ -23,4 +23,7 @@ public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> d, Socket
 	public SocketChannel wrapChannel( SocketChannel channel, SelectionKey key ) {
 		return (SocketChannel) channel;
 	}
+	@Override
+	public void close() {
+	}
 }
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -215,6 +215,8 @@ public void stop( int timeout ) throws InterruptedException {
 			ws.close( CloseFrame.GOING_AWAY );
 		}
 
+		wsf.close();
+
 		synchronized ( this ) {
 			if( selectorthread != null && selectorthread != Thread.currentThread() ) {
 				selector.wakeup();
@@ -729,5 +731,7 @@ public interface WebSocketServerFactory extends WebSocketFactory {
 		 * @return The channel on which the read and write operations will be performed.<br>
 		 */
 		public ByteChannel wrapChannel( SocketChannel channel, SelectionKey key ) throws IOException;
+
+		public void close();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,6 @@ public void close() throws IOException {`
`308`	`308`	`if( socketChannel.isOpen() )`
`309`	`309`	`socketChannel.write( wrap( emptybuffer ) );// FIXME what if not all bytes can be written`
`310`	`310`	`socketChannel.close();`
`311`		`- exec.shutdownNow();`
`312`	`311`	`}`
`313`	`312`
`314`	`313`	`private boolean isHandShakeComplete() {`
Original file line number	Diff line number	Diff line change
`@@ -48,4 +48,8 @@ public WebSocketImpl createWebSocket( WebSocketAdapter a, Draft d, Socket c ) {`
`48`	`48`	`public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> d, Socket s ) {`
`49`	`49`	`return new WebSocketImpl( a, d );`
`50`	`50`	`}`
	`51`	`+ @Override`
	`52`	`+ public void close() {`
	`53`	`+ exec.shutdown();`
	`54`	`+ }`
`51`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,7 @@ public WebSocketImpl createWebSocket( WebSocketAdapter a, List<Draft> d, Socket`
`23`	`23`	`public SocketChannel wrapChannel( SocketChannel channel, SelectionKey key ) {`
`24`	`24`	`return (SocketChannel) channel;`
`25`	`25`	`}`
	`26`	`+ @Override`
	`27`	`+ public void close() {`
	`28`	`+ }`
`26`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,8 @@ public void stop( int timeout ) throws InterruptedException {`
`215`	`215`	`ws.close( CloseFrame.GOING_AWAY );`
`216`	`216`	`}`
`217`	`217`
	`218`	`+ wsf.close();`
	`219`	`+`
`218`	`220`	`synchronized ( this ) {`
`219`	`221`	`if( selectorthread != null && selectorthread != Thread.currentThread() ) {`
`220`	`222`	`selector.wakeup();`
`@@ -729,5 +731,7 @@ public interface WebSocketServerFactory extends WebSocketFactory {`
`729`	`731`	`* @return The channel on which the read and write operations will be performed.<br>`
`730`	`732`	`*/`
`731`	`733`	`public ByteChannel wrapChannel( SocketChannel channel, SelectionKey key ) throws IOException;`
	`734`	`+`
	`735`	`+ public void close();`
`732`	`736`	`}`
`733`	`737`	`}`