Author: mwringe Date: 2011-09-14 19:54:33 -0400 (Wed, 14 Sep 2011) New Revision: 7430 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java Log: GTNPORTAL-2101: fix NPE when clicking the back button when creating a new navigation node. Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2011-09-14 19:44:51 UTC (rev 7429) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2011-09-14 23:54:33 UTC (rev 7430) @@ -300,7 +300,11 @@ uiNavigationPopup.setRendered(true); event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigationPopup.getParent()); - selector.getUserNodeLabels().put(uiPageNodeForm.getPageNode().getId(), uiPageNodeForm.getPageNode().getI18nizedLabels()); + TreeNode pageNode = uiPageNodeForm.getPageNode(); + if (pageNode != null) + { + selector.getUserNodeLabels().put(pageNode.getId(), pageNode.getI18nizedLabels()); + } selector.createEvent("NodeModified", Phase.PROCESS, event.getRequestContext()).broadcast(); }