svn commit: r1774186 - in /tomcat/trunk/java/org/apache/coyote/ajp: AbstractAjpProtocol.java AjpProcessor.java

[markt]

Author: markt
Date: Wed Dec 14 11:06:18 2016
New Revision: 1774186

URL: http://svn.apache.org/viewvc?rev=1774186&view=rev
Log:
Don't duplicate storage of requiredSecret in the Processor

Modified:
    tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
    tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java?rev=1774186&r1=1774185&r2=1774186&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProtocol.java Wed Dec 14 
11:06:18 2016
@@ -139,13 +139,18 @@ public abstract class AbstractAjpProtoco
     }
 
 
+    private String requiredSecret = null;
     /**
-     * Required secret.
+     * Set the required secret that must be included with every request.
+     *
+     * @param requiredSecret The required secret
      */
-    private String requiredSecret = null;
     public void setRequiredSecret(String requiredSecret) {
         this.requiredSecret = requiredSecret;
     }
+    protected String getRequiredSecret() {
+        return requiredSecret;
+    }
 
 
     /**
@@ -192,7 +197,6 @@ public abstract class AbstractAjpProtoco
     protected Processor createProcessor() {
         AjpProcessor processor = new AjpProcessor(this);
         processor.setAdapter(getAdapter());
-        processor.setRequiredSecret(requiredSecret);
         processor.setKeepAliveTimeout(getKeepAliveTimeout());
         processor.setClientCertProvider(getClientCertProvider());
         return processor;

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java?rev=1774186&r1=1774185&r2=1774186&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpProcessor.java Wed Dec 14 
11:06:18 2016
@@ -290,15 +290,6 @@ public class AjpProcessor extends Abstra
 
 
     /**
-     * Required secret.
-     */
-    private String requiredSecret = null;
-    public void setRequiredSecret(String requiredSecret) {
-        this.requiredSecret = requiredSecret;
-    }
-
-
-    /**
      * When client certificate information is presented in a form other than
      * instances of {@link java.security.cert.X509Certificate} it needs to be
      * converted before it can be used and this property controls which JSSE
@@ -742,6 +733,7 @@ public class AjpProcessor extends Abstra
         }
 
         // Decode extra attributes
+        String requiredSecret = protocol.getRequiredSecret();
         boolean secret = false;
         byte attributeCode;
         while ((attributeCode = requestHeaderMessage.getByte())



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