Fixed fatal error in buffer management which could cause buffers to be

Davidiusdadi · Davidiusdadi · commit 62306de87f44 · 2013-07-25T00:35:53.000+02:00
used more than once at the time resulting in strange protocol errors.
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -325,6 +325,7 @@ public void run() {
 							ByteBuffer buf = takeBuffer();
 							try {
 								if( SocketChannelIOHelper.read( buf, conn, (ByteChannel) conn.channel ) ) {
+									assert ( buf.hasRemaining() );
 									conn.inQueue.put( buf );
 									queue( conn );
 									i.remove();
@@ -339,9 +340,6 @@ public void run() {
 							} catch ( IOException e ) {
 								pushBuffer( buf );
 								throw e;
-							} catch ( RuntimeException e ) {
-								pushBuffer( buf );
-								throw e;
 							}
 						}
 						if( key.isWritable() ) {
@@ -359,10 +357,12 @@ public void run() {
 						try {
 							if( SocketChannelIOHelper.readMore( buf, conn, c ) )
 								iqueue.add( conn );
+							assert ( buf.hasRemaining() );
 							conn.inQueue.put( buf );
 							queue( conn );
-						} finally {
+						} catch ( IOException e ) {
 							pushBuffer( buf );
+							throw e;
 						}
 
 					}
@@ -373,7 +373,7 @@ public void run() {
 						key.cancel();
 					handleIOException( key, conn, ex );
 				} catch ( InterruptedException e ) {
-					return;// FIXME controlled shutdown
+					return;// FIXME controlled shutdown (e.g. take care of buffermanagement)
 				}
 			}
 
@@ -418,7 +418,7 @@ private void pushBuffer( ByteBuffer buf ) throws InterruptedException {
 	}
 
 	private void handleIOException( SelectionKey key, WebSocket conn, IOException ex ) {
-		//onWebsocketError( conn, ex );// conn may be null here
+		// onWebsocketError( conn, ex );// conn may be null here
 		if( conn != null ) {
 			conn.closeConnection( CloseFrame.ABNORMAL_CLOSE, ex.getMessage() );
 		} else if( key != null ) {
