svn commit: r1807331 - in /tomcat/trunk/java/org/apache/coyote/http2: Http2Protocol.java Http2UpgradeHandler.java

[markt]

Author: markt
Date: Tue Sep  5 09:44:09 2017
New Revision: 1807331

URL: http://svn.apache.org/viewvc?rev=1807331&view=rev
Log:
Refactor: Obtain ping configuration directly from protocol

Modified:
    tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
    tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1807331&r1=1807330&r2=1807331&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2Protocol.java Tue Sep  5 
09:44:09 2017
@@ -101,12 +101,9 @@ public class Http2Protocol implements Up
     @Override
     public InternalHttpUpgradeHandler 
getInternalUpgradeHandler(SocketWrapperBase<?> socketWrapper,
             Adapter adapter, Request coyoteRequest) {
-        Http2UpgradeHandler result = (socketWrapper.hasAsyncIO())
+        return socketWrapper.hasAsyncIO()
                 ? new Http2AsyncUpgradeHandler(this, adapter, coyoteRequest)
                 : new Http2UpgradeHandler(this, adapter, coyoteRequest);
-
-        result.setInitiatePingDisabled(initiatePingDisabled);
-        return result;
     }
 
 
@@ -269,4 +266,9 @@ public class Http2Protocol implements Up
     public void setInitiatePingDisabled(boolean initiatePingDisabled) {
         this.initiatePingDisabled = initiatePingDisabled;
     }
+
+
+    public boolean getInitiatePingDisabled() {
+        return initiatePingDisabled;
+    }
 }

Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1807331&r1=1807330&r2=1807331&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Tue Sep  
5 09:44:09 2017
@@ -150,6 +150,8 @@ class Http2UpgradeHandler extends Abstra
         localSettings.set(Setting.MAX_CONCURRENT_STREAMS, 
protocol.getMaxConcurrentStreams());
         localSettings.set(Setting.INITIAL_WINDOW_SIZE, 
protocol.getInitialWindowSize());
 
+        pingManager.initiateDisabled = protocol.getInitiatePingDisabled();
+
         // Initial HTTP request becomes stream 1.
         if (coyoteRequest != null) {
             if (log.isDebugEnabled()) {
@@ -1117,13 +1119,6 @@ class Http2UpgradeHandler extends Abstra
     }
 
 
-    // ------------------------------------------- Configuration 
getters/setters
-
-    public void setInitiatePingDisabled(boolean initiatePingDisabled) {
-        pingManager.initiateDisabled = initiatePingDisabled;
-    }
-
-
     // ----------------------------------------------- Http2Parser.Input 
methods
 
     @Override



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