Merge pull request #435 from pedroigor/master

[PLINK-630] - Reuse the same Identity instance during request processing.

modules/base/impl/src/main/java/org/picketlink/http/internal/SecurityFilter.java

@@ -164,16 +164,16 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
 
             pathConfiguration = this.pathMatcher.matches(request);
 
-            performAuthenticationIfRequired(pathConfiguration, request, response);
+            Identity identity = getIdentity();
+
+            performAuthenticationIfRequired(pathConfiguration, identity, request, response);
 
             if (isSecured(pathConfiguration)) {
                 if (!isMethodAllowed(pathConfiguration, request)) {
                     throw new MethodNotAllowedException("The given method is not allowed [" + request.getMethod() + "] for path [" + pathConfiguration.getUri() + "].");
                 }
 
                 if (!response.isCommitted()) {
-                    Identity identity = getIdentity();
-
                     if (!identity.isLoggedIn()) {
                         challengeClientForCredentials(pathConfiguration, request, response);
                     } else if (isLogoutPath(pathConfiguration)) {
@@ -364,8 +364,8 @@ private void challengeClientForCredentials(PathConfiguration pathConfiguration,
         }
     }
 
-    private void performAuthenticationIfRequired(PathConfiguration pathConfiguration, HttpServletRequest request, HttpServletResponse response) throws IOException {
-        Identity identity = getIdentity();
+    private void performAuthenticationIfRequired(PathConfiguration pathConfiguration, Identity identity,
+            HttpServletRequest request, HttpServletResponse response) throws IOException {
         HttpAuthenticationScheme authenticationScheme = getAuthenticationScheme(pathConfiguration, request);
 
         if (authenticationScheme != null) {