From 726c530ea7a94017810c1e88124f4b4bb1363230 Mon Sep 17 00:00:00 2001
From: Via Graphs <viagraphs@gmail.com>
Date: Thu, 11 Sep 2014 17:36:56 +0200
Subject: [PATCH 1/2] Possibility to override worker thread allocation logic in
 WebSocketServer #279

---
 .gitignore                                               | 1 +
 .../java/org/java_websocket/server/WebSocketServer.java  | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d7e41aae5..06d32bdd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ build
 *.svn
 *~
 target
+.idea
 *.ipr
 *.iml
 *.iws
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
index a45f7e133..c7d074a18 100644
--- a/src/main/java/org/java_websocket/server/WebSocketServer.java
+++ b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -79,7 +79,7 @@ public abstract class WebSocketServer extends WebSocketAdapter implements Runnab
 
 	private volatile AtomicBoolean isclosed = new AtomicBoolean( false );
 
-	private List<WebSocketWorker> decoders;
+	protected List<WebSocketWorker> decoders;
 
 	private List<WebSocketImpl> iqueue;
 	private BlockingQueue<ByteBuffer> buffers;
@@ -184,7 +184,7 @@ public WebSocketServer( InetSocketAddress address , int decodercount , List<Draf
 	public void start() {
 		if( selectorthread != null )
 			throw new IllegalStateException( getClass().getName() + " can only be started once." );
-		new Thread( this ).start();;
+		new Thread( this ).start();
 	}
 
 	/**
@@ -219,9 +219,6 @@ public void stop( int timeout ) throws InterruptedException {
 
 		synchronized ( this ) {
 			if( selectorthread != null ) {
-				if( Thread.currentThread() != selectorthread ) {
-
-				}
 				if( selectorthread != Thread.currentThread() ) {
 					if( socketsToClose.size() > 0 )
 						selectorthread.join( timeout );// isclosed will tell the selectorthread to go down after the last connection was closed
@@ -422,7 +419,7 @@ public ByteBuffer createBuffer() {
 		return ByteBuffer.allocate( WebSocketImpl.RCVBUF );
 	}
 
-	private void queue( WebSocketImpl ws ) throws InterruptedException {
+	protected void queue( WebSocketImpl ws ) throws InterruptedException {
 		if( ws.workerThread == null ) {
 			ws.workerThread = decoders.get( queueinvokes % decoders.size() );
 			queueinvokes++;

From 97f6bfda5dc929cc4e6ea3b1b40ddef4b50485c4 Mon Sep 17 00:00:00 2001
From: Via Graphs <viagraphs@gmail.com>
Date: Thu, 11 Sep 2014 17:43:29 +0200
Subject: [PATCH 2/2] Possibility to listen to client connection errors only

---
 src/main/java/org/java_websocket/server/WebSocketServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
index c7d074a18..2b454a769 100644
--- a/src/main/java/org/java_websocket/server/WebSocketServer.java
+++ b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -565,7 +565,7 @@ protected boolean addConnection( WebSocket ws ) {
 	 *            may be null if the error does not belong to a single connection
 	 */
 	@Override
-	public final void onWebsocketError( WebSocket conn, Exception ex ) {
+	public void onWebsocketError( WebSocket conn, Exception ex ) {
 		onError( conn, ex );
 	}