[jbossweb-commits] JBossWeb SVN: r2124 - branches/7.2.x/src/main/java/org/apache/coyote/http11.

Author: remy.maucherat(a)jboss.com Date: 2012-11-14 10:18:42 -0500 (Wed, 14 Nov 2012) New Revision: 2124 Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java Log: - Only event mode should touch the read notification flag on begin. Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java 2012-11-14 15:10:19 UTC (rev 2123) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AbstractProcessor.java 2012-11-14 15:18:42 UTC (rev 2124) @@ -203,7 +203,7 @@ /** * True if a read has been requested. */ - protected boolean readNotifications = true; + protected boolean readNotifications = false; /** * True if a write has been requested. */ @@ -480,7 +480,7 @@ */ public void recycle() { timeout = -1; - readNotifications = true; + readNotifications = false; writeNotification = false; resumeNotification = false; eventProcessing = true; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java 2012-11-14 15:10:19 UTC (rev 2123) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11AprProcessor.java 2012-11-14 15:18:42 UTC (rev 2124) @@ -314,7 +314,7 @@ protected String server = null; - protected boolean readNotifications = true; + protected boolean readNotifications = false; protected boolean writeNotification = false; protected boolean resumeNotification = false; protected boolean eventProcessing = true; @@ -988,7 +988,7 @@ outputBuffer.recycle(); this.socket = 0; timeout = -1; - readNotifications = true; + readNotifications = false; writeNotification = false; resumeNotification = false; eventProcessing = true; @@ -1250,6 +1250,7 @@ Socket.timeoutSet(socket, 0); outputBuffer.setNonBlocking(true); inputBuffer.setNonBlocking(true); + readNotifications = true; } } else if (actionCode == ActionCode.ACTION_EVENT_END) { event = false; Modified: branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java =================================================================== --- branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java 2012-11-14 15:10:19 UTC (rev 2123) +++ branches/7.2.x/src/main/java/org/apache/coyote/http11/Http11NioProcessor.java 2012-11-14 15:18:42 UTC (rev 2124) @@ -706,6 +706,7 @@ if (param == Boolean.TRUE) { outputBuffer.setNonBlocking(true); inputBuffer.setNonBlocking(true); + readNotifications = true; } }