Merge pull request TooTallNate#174 from temka1234/master

Davidiusdadi · Davidiusdadi · commit 2d0ff9f27a57 · 2013-04-24T11:23:19.000-07:00
Adding additional condition (checks 'CLOSED' status) for isNeedRead() method (TooTallNate#171)
diff --git a/src/main/java/org/java_websocket/SSLSocketChannel2.java b/src/main/java/org/java_websocket/SSLSocketChannel2.java
@@ -313,7 +313,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
`@@ -313,7 +313,8 @@ public void writeMore() throws IOException {`
`313`	`313`
`314`	`314`	`@Override`
`315`	`315`	`public boolean isNeedRead() {`
`316`		`- return inData.hasRemaining() \|\| ( inCrypt.hasRemaining() && engineResult.getStatus() != Status.BUFFER_UNDERFLOW );`
	`316`	`+ return inData.hasRemaining() \|\| ( inCrypt.hasRemaining() && engineResult.getStatus() != Status.BUFFER_UNDERFLOW &&`
	`317`	`+ engineResult.getStatus() != Status.CLOSED );`
`317`	`318`	`}`
`318`	`319`
`319`	`320`	`@Override`