Apply violetagg's performance improvement.

This closes #43 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1782779 13f79535-47bb-0310-9956-ffa450edef68
apache · Feb 13, 2017 · f14440d · f14440d
1 parent 5845934
commit f14440d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -23,6 +23,7 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 import javax.security.auth.Subject;
@@ -219,7 +220,7 @@ public AuthenticatorBase() {
     protected SingleSignOn sso = null;
 
     private volatile String jaspicAppContextID = null;
-    private volatile AuthConfigProvider jaspicProvider = null;
+    private volatile Optional<AuthConfigProvider> jaspicProvider = null;
 
 
     // ------------------------------------------------------------- Properties
@@ -1186,29 +1187,29 @@ protected synchronized void stopInternal() throws LifecycleException {
 
 
     private AuthConfigProvider getJaspicProvider() {
-        AuthConfigProvider provider = jaspicProvider;
+        Optional<AuthConfigProvider> provider = jaspicProvider;
         if (provider == null) {
-            AuthConfigFactory factory = AuthConfigFactory.getFactory();
+            provider = findJaspicProvider();
-            provider = factory.getConfigProvider("HttpServlet", jaspicAppContextID, this);
-            if (provider != null) {
-                jaspicProvider = provider;
-            }
         }
-        return provider;
+        return provider.orElse(null);
     }
 
+    private Optional<AuthConfigProvider> findJaspicProvider() {
+        AuthConfigFactory factory = AuthConfigFactory.getFactory();
+        Optional<AuthConfigProvider> provider =
+                Optional.ofNullable(factory.getConfigProvider("HttpServlet", jaspicAppContextID, this));
+        jaspicProvider = provider;
+        return provider;
+    }
 
     @Override
     public void notify(String layer, String appContext) {
-        AuthConfigFactory factory = AuthConfigFactory.getFactory();
+        findJaspicProvider();
-        AuthConfigProvider provider = factory.getConfigProvider("HttpServlet", jaspicAppContextID,
-                this);
-        jaspicProvider = provider;
     }
 
 
     private static class JaspicState {
         public MessageInfo messageInfo = null;
         public ServerAuthContext serverAuthContext = null;
     }
-}
+}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -80,6 +80,10 @@
         registered <code>RegistrationListener</code>s when a new
         <code>AuthConfigProvider</code> is registered. (markt)
       </fix>
+      <scode>
+        Improve the performance of <code>AuthenticatorBase</code> when there is
+        no JASPIC configuration available. (violetagg)
+      </scode>
     </changelog>
   </subsection>
   <subsection name="Coyote">