Author: markt
Date: Tue Feb 27 22:37:01 2018
New Revision: 1825514
URL: http://svn.apache.org/viewvc?rev=1825514&view=rev
Log:
Clean-up
A running Context always has a non-null Authenticator
Clean-up the few remaining places that the unnecessary null checks remained.
Modified:
tomcat/trunk/java/org/apache/catalina/Context.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1825514&r1=1825513&r2=1825514&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Context.java Tue Feb 27 22:37:01 2018
@@ -699,8 +699,8 @@ public interface Context extends Contain
public void setJarScanner(JarScanner jarScanner);
/**
- * @return the {@link Authenticator} that is used by this context or
- * <code>null</code> if none is used.
+ * @return the {@link Authenticator} that is used by this context. This is
+ * always non-{@code null} for a started Context
*/
public Authenticator getAuthenticator();
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1825514&r1=1825513&r2=1825514&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Tue Feb
27 22:37:01 2018
@@ -849,12 +849,7 @@ public class CoyoteAdapter implements Ad
}
if (req.getRemoteUserNeedsAuthorization()) {
Authenticator authenticator =
request.getContext().getAuthenticator();
- if (authenticator == null) {
- // No security constraints configured for the application
so
- // no need to authorize the user. Use the CoyotePrincipal
to
- // provide the authenticated user.
- request.setUserPrincipal(new CoyotePrincipal(username));
- } else if (!(authenticator instanceof AuthenticatorBase)) {
+ if (!(authenticator instanceof AuthenticatorBase)) {
if (log.isDebugEnabled()) {
log.debug(sm.getString("coyoteAdapter.authorize",
username));
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1825514&r1=1825513&r2=1825514&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Feb 27
22:37:01 2018
@@ -2691,12 +2691,7 @@ public class Request implements HttpServ
sm.getString("coyoteRequest.alreadyAuthenticated"));
}
- Context context = getContext();
- if (context.getAuthenticator() == null) {
- throw new ServletException("no authenticator");
- }
-
- context.getAuthenticator().login(username, password, this);
+ getContext().getAuthenticator().login(username, password, this);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
