tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r1830808 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Date Thu, 03 May 2018 09:44:21 GMT
Author: remm
Date: Thu May  3 09:44:21 2018
New Revision: 1830808

URL: http://svn.apache.org/viewvc?rev=1830808&view=rev
Log:
r1830355 part 2. I'll then try again r1830592 in CI.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1830808&r1=1830807&r2=1830808&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu May  3 09:44:21 2018
@@ -907,7 +907,6 @@ public class Nio2Endpoint extends Abstra
                         boolean notify = false;
                         readPending.release();
                         if (state.block == BlockingMode.BLOCK && currentState !=
CompletionState.INLINE) {
-                            state.state = currentState;
                             notify = true;
                         } else {
                             state.state = currentState;
@@ -917,6 +916,7 @@ public class Nio2Endpoint extends Abstra
                         }
                         if (notify) {
                             synchronized (state) {
+                                state.state = currentState;
                                 state.notify();
                             }
                         }
@@ -939,7 +939,6 @@ public class Nio2Endpoint extends Abstra
                 readPending.release();
                 readPending.release();
                 if (state.block == BlockingMode.BLOCK) {
-                    state.state = Nio2Endpoint.isInline() ? CompletionState.ERROR : CompletionState.DONE;
                     notify = true;
                 } else {
                     state.state = Nio2Endpoint.isInline() ? CompletionState.ERROR : CompletionState.DONE;
@@ -953,6 +952,7 @@ public class Nio2Endpoint extends Abstra
                 }
                 if (notify) {
                     synchronized (state) {
+                        state.state = Nio2Endpoint.isInline() ? CompletionState.ERROR : CompletionState.DONE;
                         state.notify();
                     }
                 }
@@ -985,7 +985,6 @@ public class Nio2Endpoint extends Abstra
                         boolean notify = false;
                         writePending.release();
                         if (state.block == BlockingMode.BLOCK && currentState !=
CompletionState.INLINE) {
-                            state.state = currentState;
                             notify = true;
                         } else {
                             state.state = currentState;
@@ -995,6 +994,7 @@ public class Nio2Endpoint extends Abstra
                         }
                         if (notify) {
                             synchronized (state) {
+                                state.state = currentState;
                                 state.notify();
                             }
                         }
@@ -1016,7 +1016,6 @@ public class Nio2Endpoint extends Abstra
                 boolean notify = false;
                 writePending.release();
                 if (state.block == BlockingMode.BLOCK) {
-                    state.state = Nio2Endpoint.isInline() ? CompletionState.ERROR : CompletionState.DONE;
                     notify = true;
                 } else {
                     state.state = Nio2Endpoint.isInline() ? CompletionState.ERROR : CompletionState.DONE;
@@ -1026,6 +1025,7 @@ public class Nio2Endpoint extends Abstra
                 }
                 if (notify) {
                     synchronized (state) {
+                        state.state = Nio2Endpoint.isInline() ? CompletionState.ERROR : CompletionState.DONE;
                         state.notify();
                     }
                 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message