svn commit: r1715382 - in /tomcat/trunk/java/org/apache/catalina: authenticator/jaspic/JaspicAuthenticator.java startup/ContextConfig.java

[remm]

Author: remm
Date: Fri Nov 20 16:11:59 2015
New Revision: 1715382

URL: http://svn.apache.org/viewvc?rev=1715382&view=rev
Log:
Remove duplication for the appContext.

Modified:
    
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
    tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java

Modified: 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java?rev=1715382&r1=1715381&r2=1715382&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/JaspicAuthenticator.java
 Fri Nov 20 16:11:59 2015
@@ -50,6 +50,7 @@ public class JaspicAuthenticator extends
     private static final String AUTH_TYPE = "JASPIC";
     public static final String MESSAGE_LAYER = "HttpServlet";
 
+    private String appContext;
     private Subject serviceSubject;
 
     private Map<String, String> authProperties = new HashMap<>();
@@ -61,6 +62,7 @@ public class JaspicAuthenticator extends
         super.startInternal();
         serviceSubject = new Subject();
         callbackHandler = getJaspicCallbackHandler();
+        appContext = context.getServletContext().getVirtualServerName() + " " 
+ context.getServletContext().getContextPath();
     }
 
 
@@ -73,7 +75,6 @@ public class JaspicAuthenticator extends
         MessageInfoImpl messageInfo = new MessageInfoImpl(request, response, 
true);
 
         AuthConfigFactory factory = AuthConfigFactory.getFactory();
-        String appContext = getAppContextId(request);
 
         AuthConfigProvider configProvider = 
factory.getConfigProvider(MESSAGE_LAYER, appContext,
                 null);
@@ -133,11 +134,6 @@ public class JaspicAuthenticator extends
     }
 
 
-    private String getAppContextId(Request request) {
-        return request.getServletContext().getVirtualServerName() + " " + 
request.getContextPath();
-    }
-
-
     private JaspicCallbackHandler getJaspicCallbackHandler() {
         return new JaspicCallbackHandler(container.getRealm());
     }
@@ -158,4 +154,8 @@ public class JaspicAuthenticator extends
         return Collections.unmodifiableMap(authProperties);
     }
 
+    public String getAppContext() {
+        return appContext;
+    }
+
 }

Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1715382&r1=1715381&r2=1715382&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Nov 20 
16:11:59 2015
@@ -458,11 +458,7 @@ public class ContextConfig implements Li
         AuthConfigFactory authConfigFactory = AuthConfigFactory.getFactory();
         TomcatAuthConfigProvider provider = new 
TomcatAuthConfigProvider(context, authenticator.getAuthProperties());
         authConfigFactory.registerConfigProvider(provider, 
JaspicAuthenticator.MESSAGE_LAYER,
-                getJaspicAppContext(), "Tomcat Jaspic");
-    }
-
-    private String getJaspicAppContext() {
-        return context.getServletContext().getVirtualServerName() + " " + 
context.getPath();
+                authenticator.getAppContext(), "Apache Tomcat JASPIC");
     }
 
     /**



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