svn commit: r1772607 - in /tomcat/trunk/java/org/apache/coyote: AbstractProcessor.java http2/StreamProcessor.java

[markt]

Author: markt
Date: Mon Dec  5 09:02:40 2016
New Revision: 1772607

URL: http://svn.apache.org/viewvc?rev=1772607&view=rev
Log:
Fix NPE when starting async

Modified:
    tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
    tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1772607&r1=1772606&r2=1772607&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Mon Dec  5 
09:02:40 2016
@@ -59,22 +59,12 @@ public abstract class AbstractProcessor
     private ErrorState errorState = ErrorState.NONE;
 
 
-    /**
-     * Used by HTTP/2.
-     * @param coyoteRequest The request
-     * @param coyoteResponse The response
-     */
-    protected AbstractProcessor(Request coyoteRequest, Response 
coyoteResponse) {
-        this(null, coyoteRequest, coyoteResponse);
-    }
-
-
     public AbstractProcessor(AbstractEndpoint<?> endpoint) {
         this(endpoint, new Request(), new Response());
     }
 
 
-    private AbstractProcessor(AbstractEndpoint<?> endpoint, Request 
coyoteRequest,
+    protected AbstractProcessor(AbstractEndpoint<?> endpoint, Request 
coyoteRequest,
             Response coyoteResponse) {
         this.endpoint = endpoint;
         asyncStateMachine = new AsyncStateMachine(this);

Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1772607&r1=1772606&r2=1772607&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Mon Dec  5 
09:02:40 2016
@@ -43,8 +43,9 @@ class StreamProcessor extends AbstractPr
     private final Stream stream;
 
 
-    StreamProcessor(Http2UpgradeHandler handler, Stream stream, Adapter 
adapter, SocketWrapperBase<?> socketWrapper) {
-        super(stream.getCoyoteRequest(), stream.getCoyoteResponse());
+    StreamProcessor(Http2UpgradeHandler handler, Stream stream, Adapter 
adapter,
+            SocketWrapperBase<?> socketWrapper) {
+        super(socketWrapper.getEndpoint(), stream.getCoyoteRequest(), 
stream.getCoyoteResponse());
         this.handler = handler;
         this.stream = stream;
         setAdapter(adapter);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org