diff options
| author | Greg Wilkins | 2014-04-30 20:13:24 +0000 |
|---|---|---|
| committer | Greg Wilkins | 2014-04-30 20:15:15 +0000 |
| commit | d03738a289791381e7c2b9612150910bd7015e10 (patch) | |
| tree | cd61c5708073e291e47430fe7c9c5daf63b936c4 | |
| parent | 0ac84fd6ffef51468d39bb862fe764dd8c2edfe7 (diff) | |
| download | org.eclipse.jetty.project-d03738a289791381e7c2b9612150910bd7015e10.tar.gz org.eclipse.jetty.project-d03738a289791381e7c2b9612150910bd7015e10.tar.xz org.eclipse.jetty.project-d03738a289791381e7c2b9612150910bd7015e10.zip | |
Added ASYNC_WOKEN state to HttpChannelState
(cherry picked from commit 30652825fa10c84c959ab8a21796e0fb073fdaee)
| -rw-r--r-- | jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java | 13 | ||||
| -rw-r--r-- | jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java index 9ff6b37a85..7ff4d5a2a4 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java @@ -184,8 +184,6 @@ public class HttpChannelState case COMPLETED: return Action.WAIT; - case ASYNC_WAIT: - LOG.warn("How did I get here?", new Throwable()); case ASYNC_WOKEN: if (_asyncRead) { @@ -219,6 +217,7 @@ public class HttpChannelState _async=null; return Action.ASYNC_EXPIRED; case STARTED: + // TODO if (DEBUG) LOG.debug("TODO Fix this double dispatch",new IllegalStateException(this .getStatusString())); @@ -361,9 +360,17 @@ public class HttpChannelState case ASYNC_IO: dispatch=false; break; - default: + case ASYNC_WAIT: + _state=State.ASYNC_WOKEN; dispatch=true; break; + case ASYNC_WOKEN: + dispatch=false; + break; + default: + LOG.warn("async dispatched when complete {}",this); + dispatch=false; + break; } } diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java b/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java index 9b353b1bdb..c969f94911 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/SharedBlockingCallback.java @@ -222,7 +222,7 @@ public class SharedBlockingCallback if (_state == IDLE) throw new IllegalStateException("IDLE"); if (_state == null) - LOG.warn(new Throwable()); + LOG.debug("Blocker not complete",new Throwable()); } finally { |