UNDERTOW-1377 SslConduit race can result in suspended reads

Author: stuartwdouglas

core/src/main/java/io/undertow/protocols/ssl/SslConduit.java

@@ -1135,7 +1135,12 @@ public void readReady() {
                 } finally {
                     invokingReadListenerHandshake = false;
                 }
+
+                if(!anyAreSet(state, FLAG_READS_RESUMED) && !allAreSet(state, FLAG_WRITE_REQUIRES_READ | FLAG_WRITES_RESUMED)) {
+                    delegate.getSourceChannel().suspendReads();
+                }
             }
+
             boolean noProgress = false;
             int initialDataToUnwrap = -1;
             int initialUnwrapped = -1;
@@ -1162,9 +1167,7 @@ public void readReady() {
                     delegateHandler.readReady();
                 }
             }
-            if(!anyAreSet(state, FLAG_READS_RESUMED) && !allAreSet(state, FLAG_WRITE_REQUIRES_READ | FLAG_WRITES_RESUMED)) {
-                delegate.getSourceChannel().suspendReads();
-            } else if(anyAreSet(state, FLAG_READS_RESUMED) && (unwrappedData != null || anyAreSet(state, FLAG_DATA_TO_UNWRAP))) {
+            if(anyAreSet(state, FLAG_READS_RESUMED) && (unwrappedData != null || anyAreSet(state, FLAG_DATA_TO_UNWRAP))) {
                 if(anyAreSet(state, FLAG_READ_CLOSED)) {
                     if(unwrappedData != null) {
                         unwrappedData.close();

core/src/test/java/io/undertow/server/ssl/SimpleSSLTestCase.java

@@ -178,7 +178,7 @@ public void run() {
                     }
                 }
             };
-            for (int i = 0; i < concurrency * 3000; i++) {
+            for (int i = 0; i < concurrency * 300; i++) {
                 executorService.submit(task);
             }
             executorService.shutdown();