[tomcat] 01/04: Align with 8.5.x. Clean-up. Remove ununsed code.

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 47235d9a2083ab52ea03f44d51f556667636f614
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 27 22:37:02 2019 +0100

    Align with 8.5.x. Clean-up. Remove ununsed code.
---
 .../catalina/authenticator/AuthenticatorBase.java  | 22 ++++++++++++----------
 .../catalina/authenticator/FormAuthenticator.java  | 11 -----------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java 
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 2bb4746..eb9d35e 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -78,10 +78,6 @@ public abstract class AuthenticatorBase extends ValveBase
      */
     private static final String DATE_ONE = 
ConcurrentDateFormat.formatRfc1123(new Date(1));
 
-    public AuthenticatorBase() {
-        super(true);
-    }
-
     /**
      * The string manager for this package.
      */
@@ -97,6 +93,14 @@ public abstract class AuthenticatorBase extends ValveBase
      */
     protected static final String REALM_NAME = "Authentication required";
 
+    // ------------------------------------------------------ Constructor
+
+    public AuthenticatorBase() {
+        super(true);
+    }
+
+    // ----------------------------------------------------- Instance Variables
+
     /**
      * Should a session always be used once a user is authenticated? This may
      * offer some performance benefits since the session can then be used to
@@ -497,7 +501,6 @@ public abstract class AuthenticatorBase extends ValveBase
             response.setHeader("Expires", DATE_ONE);
         }
 
-        int i;
         if (constraints != null) {
             // Enforce any user data constraint for this security constraint
             if (log.isDebugEnabled()) {
@@ -522,7 +525,7 @@ public abstract class AuthenticatorBase extends ValveBase
             authRequired = false;
         } else {
             authRequired = true;
-            for(i=0; i < constraints.length && authRequired; i++) {
+            for(int i = 0; i < constraints.length && authRequired; i++) {
                 if(!constraints[i].getAuthConstraint()) {
                     authRequired = false;
                 } else if(!constraints[i].getAllRoles()) {
@@ -545,7 +548,7 @@ public abstract class AuthenticatorBase extends ValveBase
             authRequired = certs != null && certs.length > 0;
         }
 
-        if(authRequired) {
+        if (authRequired) {
             if (log.isDebugEnabled()) {
                 log.debug(" Calling authenticate()");
             }
@@ -817,9 +820,8 @@ public abstract class AuthenticatorBase extends ValveBase
      * @param password
      *            Password used to authenticate (if any)
      */
-    public void register(Request request, HttpServletResponse response,
-                            Principal principal, String authType,
-                            String username, String password) {
+    public void register(Request request, HttpServletResponse response, 
Principal principal,
+            String authType, String username, String password) {
 
         if (log.isDebugEnabled()) {
             String name = (principal == null) ? "none" : principal.getName();
diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java 
b/java/org/apache/catalina/authenticator/FormAuthenticator.java
index 935486b..809556e 100644
--- a/java/org/apache/catalina/authenticator/FormAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java
@@ -38,7 +38,6 @@ import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.ExceptionUtils;
 import org.apache.tomcat.util.buf.ByteChunk;
-import org.apache.tomcat.util.buf.CharChunk;
 import org.apache.tomcat.util.buf.MessageBytes;
 import org.apache.tomcat.util.http.MimeHeaders;
 
@@ -229,9 +228,6 @@ public class FormAuthenticator
         }
 
         // Acquire references to objects we will need to evaluate
-        MessageBytes uriMB = MessageBytes.newInstance();
-        CharChunk uriCC = uriMB.getCharChunk();
-        uriCC.setLimit(-1);
         String contextPath = request.getContextPath();
         String requestURI = request.getDecodedRequestURI();
 
@@ -575,8 +571,6 @@ public class FormAuthenticator
         }
 
         request.getCoyoteRequest().getParameters().recycle();
-        request.getCoyoteRequest().getParameters().setQueryStringEncoding(
-                request.getConnector().getURIEncoding());
 
         ByteChunk body = saved.getBody();
 
@@ -611,11 +605,6 @@ public class FormAuthenticator
         request.getQueryString();
         request.getProtocol();
 
-        request.getCoyoteRequest().queryString().setString
-            (saved.getQueryString());
-
-        request.getCoyoteRequest().requestURI().setString
-            (saved.getRequestURI());
         return true;
     }
 


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