[gatein-commits] gatein SVN: r5123 - exo/portal/branches/3.1.x/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component.

Wednesday, 17 November 2010


Author: kien_nguyen
Date: 2010-11-16 22:41:52 -0500 (Tue, 16 Nov 2010)
New Revision: 5123

Modified:
  
exo/portal/branches/3.1.x/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
Log:
EXOGTN-145 [PLF] NullPointerException in UIUserToolBarDashboardPortlet.gtmpl if no
navigation.xml created for a LDAP user

Modified:
exo/portal/branches/3.1.x/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
===================================================================
---
exo/portal/branches/3.1.x/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl	2010-11-17
03:36:51 UTC (rev 5122)
+++
exo/portal/branches/3.1.x/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl	2010-11-17
03:41:52 UTC (rev 5123)
@@ -91,7 +91,7 @@
 
 <% 
 	String defaultDashboardPage;				
-	if(currentUserNavigation.getNodes() ==null || currentUserNavigation.getNodes().size()
< 1){ 
+	if(currentUserNavigation == null || currentUserNavigation.getNodes() == null ||
currentUserNavigation.getNodes().size() < 1){ 
 		defaultDashboardPage =
org.exoplatform.toolbar.webui.component.UIUserToolBarDashboardPortlet.DEFAULT_TAB_NAME;
 %>
 	<div class="UIUserToolBarDashboardPortlet"
id="$uicomponent.id">	


    