[gatein-commits] gatein SVN: r4976 - epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component.

Tuesday, 9 November 2010


Author: thomas.heute(a)jboss.com
Date: 2010-11-09 03:34:22 -0500 (Tue, 09 Nov 2010)
New Revision: 4976

Modified:
  
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
Log:
JBEPP-579: NullPointerException in UIUserToolBarDashboardPortlet.gtmpl if no
navigation.xml created for a LDAP user


Modified:
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
===================================================================
---
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl	2010-11-09
08:26:30 UTC (rev 4975)
+++
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl	2010-11-09
08:34:22 UTC (rev 4976)
@@ -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">	


    