Author: trong.tran Date: 2011-07-04 00:31:07 -0400 (Mon, 04 Jul 2011) New Revision: 6803 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java Log: NPE if 'Back' button clicked when add new node Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-07-02 18:36:23 UTC (rev 6802) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2011-07-04 04:31:07 UTC (rev 6803) @@ -411,7 +411,11 @@ uiNavigationPopup.setWindowSize(400, 400); context.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, context).broadcast(); }