From 053872acf3d5f9941bcbb025ca7d557ad814663a Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Tue, 11 Mar 2008 10:43:37 +0000
Subject: [PATCH] Merged V2.2 to HEAD    8282: Merged V2.1-A to V2.2      
 8263: Added debug error logging for NavigationBean getCompanyHomeVisible and
 getGuestHomeVisible.       8272: Program to load Alfresco with Person objects
    8377: Merged V2.1 to V2.2       8374: Fix for AR-2087

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/web/bean/NavigationBean.java | 47 ++++++++++++++-----
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/source/java/org/alfresco/web/bean/NavigationBean.java b/source/java/org/alfresco/web/bean/NavigationBean.java
index 39a996c1af..626918c6b8 100644
--- a/source/java/org/alfresco/web/bean/NavigationBean.java
+++ b/source/java/org/alfresco/web/bean/NavigationBean.java
@@ -92,6 +92,7 @@ public class NavigationBean implements Serializable
    /** Public JSF Bean name */
    public static final String BEAN_NAME = "NavigationBean";
    
+   private static Log logger = LogFactory.getLog(NavigationBean.class);
 
    /**
     * Default constructor
@@ -843,34 +844,56 @@ public class NavigationBean implements Serializable
    }
    
    /**
-    * @return true if the Company home node is accessable to the current user
+    * @return true if the Company home node is accessible to the current user
     */
    public boolean getCompanyHomeVisible()
    {
-      Node companyHomeNode = getCompanyHomeNode();
-      if (companyHomeNode != null)
+      try
       {
-          return companyHomeNode.hasPermission(PermissionService.READ);
+         Node companyHomeNode = getCompanyHomeNode();
+         if (companyHomeNode != null)
+         {
+            return companyHomeNode.hasPermission(PermissionService.READ);
+         }
+         else
+         {
+            return false;
+         }
       }
-      else
+      catch (Throwable e)
       {
-          return false;
+         if (logger.isDebugEnabled())
+         {
+            logger.debug("getCompanyHomeVisible failed", e);
+         }
+         return false;
       }
    }
    
    /**
-    * @return true if the Guest home node is accessable to the current user
+    * @return true if the Guest home node is accessible to the current user
     */
    public boolean getGuestHomeVisible()
    {
-      if (this.getAuthService().guestUserAuthenticationAllowed())
+      try
       {
-         Node guestHome = getGuestHomeNode();
-         return guestHome != null && guestHome.hasPermission(PermissionService.READ);
+         if (this.getAuthService().guestUserAuthenticationAllowed())
+         {
+            Node guestHome = getGuestHomeNode();
+            return guestHome != null && guestHome.hasPermission(PermissionService.READ);
+         }
+         else
+         {
+            return false;
+         }
       }
-      else
+      catch (Throwable e)
       {
-         return false;
+         if (logger.isDebugEnabled())
+         {
+            logger.debug("getGuestHomeVisible failed", e);
+         }
+         return false;
       }
    }