Author: ips Date: 2008-10-23 23:02:30 -0400 (Thu, 23 Oct 2008) New Revision: 22 Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java Log: fix a couple NPEs Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2008-10-24 01:57:38 UTC (rev 21) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationAction.java 2008-10-24 03:02:30 UTC (rev 22) @@ -318,7 +318,7 @@ enabledTabs.add(Constants.TAB_CONTENT); } } - + return enabledTabs; } @@ -345,10 +345,7 @@ ConfigurationDefinition resourceConfigurationDef = resource.getResourceType().getResourceConfigurationDefinition(); if (resourceConfigurationDef != null) - { hasConfiguration = resourceConfigurationDef.getPropertyDefinitions().size() > 0; - } - return hasConfiguration; } @@ -462,9 +459,13 @@ // TODO need to determine if this can ever return null JONTreeNode node = findNode(getResourcePath(deletedResource)); // TODO need to determine if this can ever return null + if (node == null) + { + log.warn("Unable to find node for deleted Resource + '" + deletedResource.getName() + "'."); + return; + } JONTreeNode parent = node.getParent(); parent.reInitializeChildrenMap(); - log.info("About to call triggerAutodiscovery"); } // TODO consider have this return TreeNodeWithResourceType @@ -503,7 +504,6 @@ UIComponent comp = event.getComponent(); UITree tree = (UITree) comp; JONTreeNode data = (JONTreeNode) (tree.getTreeNode().getData()); - data.reInitializeChildrenMap(); } Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2008-10-24 01:57:38 UTC (rev 21) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2008-10-24 03:02:30 UTC (rev 22) @@ -184,7 +184,8 @@ String result = Constants.OUTCOME_FAILURE; Configuration configuration = getConfiguration(); - ConfigurationUpdateResponse updateResponse = configurationManager.updateResource(listItem.getResource(), configuration); + ConfigurationUpdateResponse updateResponse = configurationManager.updateResource(this.listItem.getResource(), + configuration); if (updateResponse.getStatus() == ConfigurationUpdateStatus.FAILURE) { @@ -195,7 +196,7 @@ else { facesMessages.addFromResourceBundle(FacesMessage.SEVERITY_INFO, "resource.status.update.success", - this.serviceType.getName(), this.listItem.getResource().getName()); + this.listItem.getResource().getResourceType().getName(), this.listItem.getResource().getName()); result = Constants.OUTCOME_SUCCESS; }