Author: markt
Date: Mon Feb 13 15:56:27 2017
New Revision: 1782795

URL: http://svn.apache.org/viewvc?rev=1782795&view=rev
Log:
Follow-up to r1782789
Fix logic so NO_PROVIDER_AVAILABLE is not returned.

Modified:
    
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1782795&r1=1782794&r2=1782795&view=diff
==============================================================================
--- 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
 (original)
+++ 
tomcat/tc8.5.x/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
 Mon Feb 13 15:56:27 2017
@@ -1191,11 +1191,12 @@ implements Authenticator, RegistrationLi
 
     private AuthConfigProvider getJaspicProvider() {
         AuthConfigProvider provider = jaspicProvider;
-        if (NO_PROVIDER_AVAILABLE == provider) {
-            return null;
-        } else if (provider == null) {
+        if (provider == null) {
             provider = findJaspicProvider();
         }
+        if (provider == NO_PROVIDER_AVAILABLE) {
+            return null;
+        }
         return provider;
     }
 



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

Reply via email to