Merge pull request #1419 from ubitricity/fix_issue_1418_websocketserv…

…er_misses_get

Fix issue #1418: WebSocketServer sometimes misses GET request after SSL handshake

src/main/java/org/java_websocket/SSLSocketChannel2.java

@@ -126,7 +126,7 @@ public SSLSocketChannel2(SocketChannel channel, SSLEngine sslEngine, ExecutorSer
  createBuffers(sslEngine.getSession());
  // kick off handshake
  socketChannel.write(wrap(emptybuffer));// initializes res
- processHandshake();
+ processHandshake(false);
  }
 
  private void consumeFutureUninterruptible(Future<?> f) {
@@ -148,7 +148,7 @@ private void consumeFutureUninterruptible(Future<?> f) {
  * This method will do whatever necessary to process the sslEngine handshake. Thats why it's
  * called both from the {@link #read(ByteBuffer)} and {@link #write(ByteBuffer)}
  **/
- private synchronized void processHandshake() throws IOException {
+ private synchronized void processHandshake(boolean isReading) throws IOException {
  if (sslEngine.getHandshakeStatus() == HandshakeStatus.NOT_HANDSHAKING) {
  return; // since this may be called either from a reading or a writing thread and because this method is synchronized it is necessary to double check if we are still handshaking.
  }
@@ -167,7 +167,7 @@ private synchronized void processHandshake() throws IOException {
  }
  }
 
- if (sslEngine.getHandshakeStatus() == SSLEngineResult.HandshakeStatus.NEED_UNWRAP) {
+ if (isReading && sslEngine.getHandshakeStatus() == SSLEngineResult.HandshakeStatus.NEED_UNWRAP) {
  if (!isBlocking() || readEngineResult.getStatus() == Status.BUFFER_UNDERFLOW) {
  inCrypt.compact();
  int read = socketChannel.read(inCrypt);
@@ -273,7 +273,7 @@ protected void createBuffers(SSLSession session) {
 
  public int write(ByteBuffer src) throws IOException {
  if (!isHandShakeComplete()) {
- processHandshake();
+ processHandshake(false);
  return 0;
  }
  // assert(bufferallocations > 1); // see #190
@@ -303,10 +303,10 @@ public int read(ByteBuffer dst) throws IOException {
  if (!isHandShakeComplete()) {
  if (isBlocking()) {
  while (!isHandShakeComplete()) {
- processHandshake();
+ processHandshake(true);
  }
  } else {
- processHandshake();
+ processHandshake(true);
  if (!isHandShakeComplete()) {
  return 0;
  }