Author: markt
Date: Thu Apr 7 19:20:39 2016
New Revision: 1738178
URL: http://svn.apache.org/viewvc?rev=1738178&view=rev
Log:
Investigating BZ 5926
An error page has to be able to call complete(). That means it needs to be able
to call getAsycnContext() which means isStarted needs to be true for the ERROR
state. That implies that isStarted needs to be true for the TIMING_OUT state as
well.
This also implies that a transition form DISPATCHED to ERROR is not legal since
that would mean moving from a state where isStarted==false to isStarted==true
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 7 19:20:39 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738174-1738175
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1738178&r1=1738177&r2=1738178&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8]
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/AsyncStateMachine.java [UTF-8]
Thu Apr 7 19:20:39 2016
@@ -55,13 +55,13 @@ import org.apache.tomcat.util.security.P
* |-----------------»--------------|
* | \|/
* |
|----------«---------------ERROR---------------------------«-------------------------------|
- * | | complete() /|\ \
|
- * | | | \---------------|
|
- * | | | |dispatch()
|
- * | | | \|/
|
- * | | error()| |
|
- * | | | |--|timeout() |
|
- * | | post() | | \|/ | post()
|
+ * | | complete() \
|
+ * | | \---------------|
|
+ * | | |dispatch()
|
+ * | | \|/
|
+ * | | |
|
+ * | | |--|timeout() |
|
+ * | | post() | \|/ | post()
|
* | | |---------------»DISPATCHED«---------- |
--------------COMPLETING«-----| |
* | | | /|\ | | |
/|\ | |
* | | | |---»-------| | | |--|
| |
@@ -113,11 +113,11 @@ public class AsyncStateMachine {
STARTED (true, true, false, false, false),
MUST_COMPLETE(true, true, true, false, false),
COMPLETING (true, false, true, false, false),
- TIMING_OUT (true, false, false, false, false),
+ TIMING_OUT (true, true, false, false, false),
MUST_DISPATCH(true, true, false, true, true),
DISPATCHING (true, false, false, true, false),
READ_WRITE_OP(true, true, false, false, true),
- ERROR (true, false, false, false, false);
+ ERROR (true, true, false, false, false);
private final boolean isAsync;
private final boolean isStarted;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
