From 694950c492426204c99f7bf41a554ad38f38c11b Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Mon, 2 Apr 2012 10:07:33 +0000
Subject: [PATCH] Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD    34469: Merged
 BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX       34468: Fix for ALF-13172    
      Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0             34467: Fix
 for ALF-13237 - Change dashboard Layout is not working correctly, original
 layout is still used after saving changes.    34486: Merged BRANCHES/V4.0 to
 BRANCHES/DEV/V4.0-BUG-FIX       34485: Fix for ALF-13250       Merged
 BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0          34484: Fix for ALF-13249
 - Browser auth dialog appears when cluster node goes down (should display
 Login page)    34590: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX      
 34589: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0          34581: Fix
 for ALF-9861 - Un-friendly webscript 500 error message displayed in Share
 when a user clicks on a direct document URL they don't have the permissions
 to access.    34924: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX      
 34914: Merged DEV to V4.0          34889: ALF-12678: Errors in log on startup
 (ts.alfresco.com 4.0)                
 BasicHttpAuthenticatorFactory.BasicHttpAuthenticator.authenticate(RequiredAuthentication,
 boolean) handles AuthenticationExceptions from authenticateAsGuest() calls.
 The result is a 401 Unauthorized response.       34920: Merged
 BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0                34892: Fix for
 ALF-12930                34917: Fix for ALF-12930 - pushed down to 3.4.X     
         Also related tweak for ALF-10823 to EditionInterceptor now that the
 repository returns 401 for guest auth unsupported.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../servlet/BasicHttpAuthenticatorFactory.java        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java b/source/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java
index 58533c905a..464a02e46a 100644
--- a/source/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java
+++ b/source/java/org/alfresco/repo/web/scripts/servlet/BasicHttpAuthenticatorFactory.java
@@ -122,8 +122,15 @@ public class BasicHttpAuthenticatorFactory implements ServletAuthenticatorFactor
                 if (logger.isDebugEnabled())
                     logger.debug("Authenticating as Guest");
     
-                authenticationService.authenticateAsGuest();
-                authorized = true;
+                try 
+                {
+                    authenticationService.authenticateAsGuest();
+                    authorized = true;
+                }
+                catch (AuthenticationException ex)
+                {
+                    // failed authentication
+                }
             }
             
             // authenticate as specified by explicit ticket on url