[jbossweb-commits] JBossWeb SVN: r1846 - in branches/3.0.x: webapps/docs and 1 other directory.
Author: jfrederic.clere(a)jboss.com
Date: 2011-10-03 05:49:24 -0400 (Mon, 03 Oct 2011)
New Revision: 1846
Modified:
branches/3.0.x/java/org/apache/coyote/ajp/AjpAprProcessor.java
branches/3.0.x/webapps/docs/changelog.xml
Log:
Fix for JBWEB-201
Modified: branches/3.0.x/java/org/apache/coyote/ajp/AjpAprProcessor.java
===================================================================
--- branches/3.0.x/java/org/apache/coyote/ajp/AjpAprProcessor.java 2011-10-03 08:03:55 UTC
(rev 1845)
+++ branches/3.0.x/java/org/apache/coyote/ajp/AjpAprProcessor.java 2011-10-03 09:49:24 UTC
(rev 1846)
@@ -425,7 +425,7 @@
// Error flag
error = false;
- boolean openSocket = true;
+ boolean openSocket = false;
boolean keptAlive = false;
while (!error && !event) {
@@ -437,7 +437,7 @@
// This means that no data is available right now
// (long keepalive), so that the processor should be recycled
// and the method should return true
- rp.setStage(org.apache.coyote.Constants.STAGE_ENDED);
+ openSocket = true;
// Add the socket to the poller
endpoint.getPoller().add(socket);
break;
@@ -533,7 +533,7 @@
}
} else {
recycle();
- return SocketState.CLOSED;
+ return (openSocket) ? SocketState.OPEN : SocketState.CLOSED;
}
}
Modified: branches/3.0.x/webapps/docs/changelog.xml
===================================================================
--- branches/3.0.x/webapps/docs/changelog.xml 2011-10-03 08:03:55 UTC (rev 1845)
+++ branches/3.0.x/webapps/docs/changelog.xml 2011-10-03 09:49:24 UTC (rev 1846)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 3.0.0.CR3 (jfclere)">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <jira>JBWEB-201</jira>JBoss Web Native causes JVM crash with AJP.
(jfclere/remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 3.0.0.CR2 (jfclere)">
<subsection name="Catalina">
<changelog>