Merge branch 'master' of https://github.com/TooTallNate/Java-WebSocket

Davidiusdadi · Davidiusdadi · commit 2861d78f4d9c · 2013-05-16T23:32:40.000+02:00
diff --git a/src/main/java/org/java_websocket/SSLSocketChannel2.java b/src/main/java/org/java_websocket/SSLSocketChannel2.java
@@ -314,7 +314,8 @@ public void writeMore() throws IOException {
 
 	@Override
 	public boolean isNeedRead() {
-		return inData.hasRemaining() || ( inCrypt.hasRemaining() && engineResult.getStatus() != Status.BUFFER_UNDERFLOW );
+		return inData.hasRemaining() || ( inCrypt.hasRemaining() && engineResult.getStatus() != Status.BUFFER_UNDERFLOW && 
+				engineResult.getStatus() != Status.CLOSED );
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,8 @@ public void writeMore() throws IOException {`
`314`	`314`
`315`	`315`	`@Override`
`316`	`316`	`public boolean isNeedRead() {`
`317`		`- return inData.hasRemaining() \|\| ( inCrypt.hasRemaining() && engineResult.getStatus() != Status.BUFFER_UNDERFLOW );`
	`317`	`+ return inData.hasRemaining() \|\| ( inCrypt.hasRemaining() && engineResult.getStatus() != Status.BUFFER_UNDERFLOW &&`
	`318`	`+ engineResult.getStatus() != Status.CLOSED );`
`318`	`319`	`}`
`319`	`320`
`320`	`321`	`@Override`