Author: remy.maucherat(a)jboss.com Date: 2013-10-01 05:37:36 -0400 (Tue, 01 Oct 2013) New Revision: 2268 Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java Log: Port state fixes for Servlet 3.1 upgrade. Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java 2013-10-01 09:34:23 UTC (rev 2267) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java 2013-10-01 09:37:36 UTC (rev 2268) @@ -341,6 +341,10 @@ (request.getAsyncContext() == null) ? Boolean.TRUE : Boolean.FALSE); event = true; } + if (request.getUpgradeHandler() != null) { + // Call to signal that the upgrade is now done + request.getUpgradeHandler().init(request.getEvent()); + } } else if (request.getAsyncContext() != null) { // The AC was closed right away, so call onComplete as no event callback // will occur in that case Modified: branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java =================================================================== --- branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java 2013-10-01 09:34:23 UTC (rev 2267) +++ branches/8.0.x/src/main/java/org/apache/catalina/connector/Request.java 2013-10-01 09:37:36 UTC (rev 2268) @@ -3344,8 +3344,8 @@ } response.sendUpgrade(); eventMode = true; - ugradeHandler.init(getEvent()); this.upgradeHandler = ugradeHandler; + asyncContext = new AsyncContextImpl(); return ugradeHandler; }