Author: dennyxu Date: 2008-06-19 04:05:07 -0400 (Thu, 19 Jun 2008) New Revision: 8845 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java Log: JBIDE-2369: fixed a nullpointerexception Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2008-06-19 06:04:51 UTC (rev 8844) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2008-06-19 08:05:07 UTC (rev 8845) @@ -284,9 +284,10 @@ public static String getJbossWSRuntimeLocation(IProject project) throws CoreException{ String isServerSupplied = project.getPersistentProperty(IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_SERVER_SUPPLIED_RUNTIME); - if(isServerSupplied != null && + String jbwsRuntimeName = project.getPersistentProperty(IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME); + + if(jbwsRuntimeName != null && !IJBossWSFacetDataModelProperties.DEFAULT_VALUE_IS_SERVER_SUPPLIED.equals(isServerSupplied)){ - String jbwsRuntimeName = project.getPersistentProperty(IJBossWSFacetDataModelProperties.PERSISTENCE_PROPERTY_QNAME_RUNTIME_NAME); JbossWSRuntime jbws = JbossWSRuntimeManager.getInstance().findRuntimeByName(jbwsRuntimeName); if(jbws != null){ return jbws.getHomeDir(); @@ -300,9 +301,8 @@ IFacetedProject facetedPrj = ProjectFacetsManager.create(project); org.eclipse.wst.common.project.facet.core.runtime.IRuntime prjFacetRuntime = facetedPrj.getPrimaryRuntime(); - IRuntime serverRuntime = getRuntime(prjFacetRuntime); - - if(serverRuntime != null){ + if(prjFacetRuntime != null){ + IRuntime serverRuntime = getRuntime(prjFacetRuntime); String runtimeTypeName = serverRuntime.getRuntimeType().getName(); if(runtimeTypeName == null){ runtimeTypeName = "";