Merge pull request TooTallNate#307 from raydelto/master

ThreaT · ThreaT · commit 2b8ecd600fa5 · 2015-06-07T17:27:04.000+01:00
Preventing the server to crash because of a NPE. Issue TooTallNate#224
diff --git a/src/main/java/org/java_websocket/SocketChannelIOHelper.java b/src/main/java/org/java_websocket/SocketChannelIOHelper.java
@@ -61,7 +61,7 @@ public static boolean batch( WebSocketImpl ws, ByteChannel sockchannel ) throws
 			} while ( buffer != null );
 		}
 
-		if( ws.outQueue.isEmpty() && ws.isFlushAndClose() && ws.getDraft().getRole() == Role.SERVER ) {//
+		if( ws != null && ws.outQueue.isEmpty() && ws.isFlushAndClose() && ws.getDraft() != null && ws.getDraft().getRole() != null && ws.getDraft().getRole() == Role.SERVER ) {//
 			synchronized ( ws ) {
 				ws.closeConnection();
 			}
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -707,7 +707,11 @@ public void run() {
 					assert ( buf != null );
 					try {
 						ws.decode( buf );
-					} finally {
+					} catch(Exception e){
+						System.err.println("Error while reading from remote connection: " + e);
+					}
+					
+					finally {
 						pushBuffer( buf );
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public static boolean batch( WebSocketImpl ws, ByteChannel sockchannel ) throws`
`61`	`61`	`} while ( buffer != null );`
`62`	`62`	`}`
`63`	`63`
`64`		`- if( ws.outQueue.isEmpty() && ws.isFlushAndClose() && ws.getDraft().getRole() == Role.SERVER ) {//`
	`64`	`+ if( ws != null && ws.outQueue.isEmpty() && ws.isFlushAndClose() && ws.getDraft() != null && ws.getDraft().getRole() != null && ws.getDraft().getRole() == Role.SERVER ) {//`
`65`	`65`	`synchronized ( ws ) {`
`66`	`66`	`ws.closeConnection();`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -707,7 +707,11 @@ public void run() {`
`707`	`707`	`assert ( buf != null );`
`708`	`708`	`try {`
`709`	`709`	`ws.decode( buf );`
`710`		`- } finally {`
	`710`	`+ } catch(Exception e){`
	`711`	`+ System.err.println("Error while reading from remote connection: " + e);`
	`712`	`+ }`
	`713`	`+`
	`714`	`+ finally {`
`711`	`715`	`pushBuffer( buf );`
`712`	`716`	`}`
`713`	`717`	`}`