GERONIMODEVTOOLS-774 java.lang.NullPointerException error happened for web application automatically redeploying after renamed the name of the project. Thanks Yi Xiao for the patch.

Hong Fang Han · Hong Fang Han · commit 13ba49378d38 · 2011-11-17T07:18:43.000Z
git-svn-id: https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/branches/2.1@1203087 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java b/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
@@ -668,7 +668,7 @@ protected void doRemoved(IModule module) throws Exception {
             doFail(status, Messages.UNDEPLOY_FAIL);
         }
         
-        ModuleArtifactMapper.getInstance().removeEntry(getServer(), module.getProject());
+        ModuleArtifactMapper.getInstance().removeEntry(getServer(), module);
 
         Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.doRemoved");
     }
diff --git a/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ModuleArtifactMapper.java b/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ModuleArtifactMapper.java
@@ -73,22 +73,27 @@ public void addEntry(IServer server, IProject project, String configId) {
 		artifactEntries.put(project.getName(), configId);
 	}
 
-	public void removeEntry(IServer server, IProject project) {
+	public void removeEntry(IServer server, IModule module) {
 
 		if (!SocketUtil.isLocalhost(server.getHost()))
 			return;
 
 		File runtimeLoc = server.getRuntime().getLocation().toFile();
 		Map artifactEntries = (Map) serverEntries.get(runtimeLoc);
 		if (artifactEntries != null) {
-			artifactEntries.remove(project.getName());
+			artifactEntries.remove(module.getName());
 		}
 	}
 
 	public String resolve(IServer server, IModule module) {
 		Map artifactEntries = (Map) serverEntries.get(server.getRuntime().getLocation().toFile());
-		if (artifactEntries != null) {
-			return (String) artifactEntries.get(module.getProject().getName());
+		if (artifactEntries != null && module != null) {
+			if (module.getProject() != null) {
+				return (String) artifactEntries.get(module.getProject()
+						.getName());
+			} else {
+				return (String) artifactEntries.get(module.getName());
+			}
 		}
 		return null;
 	}

Original file line number	Diff line number	Diff line change
`@@ -668,7 +668,7 @@ protected void doRemoved(IModule module) throws Exception {`
`668`	`668`	`doFail(status, Messages.UNDEPLOY_FAIL);`
`669`	`669`	`}`
`670`	`670`
`671`		`- ModuleArtifactMapper.getInstance().removeEntry(getServer(), module.getProject());`
	`671`	`+ ModuleArtifactMapper.getInstance().removeEntry(getServer(), module);`
`672`	`672`
`673`	`673`	`Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.doRemoved");`
`674`	`674`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,22 +73,27 @@ public void addEntry(IServer server, IProject project, String configId) {`
`73`	`73`	`artifactEntries.put(project.getName(), configId);`
`74`	`74`	`}`
`75`	`75`
`76`		`- public void removeEntry(IServer server, IProject project) {`
	`76`	`+ public void removeEntry(IServer server, IModule module) {`
`77`	`77`
`78`	`78`	`if (!SocketUtil.isLocalhost(server.getHost()))`
`79`	`79`	`return;`
`80`	`80`
`81`	`81`	`File runtimeLoc = server.getRuntime().getLocation().toFile();`
`82`	`82`	`Map artifactEntries = (Map) serverEntries.get(runtimeLoc);`
`83`	`83`	`if (artifactEntries != null) {`
`84`		`- artifactEntries.remove(project.getName());`
	`84`	`+ artifactEntries.remove(module.getName());`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`public String resolve(IServer server, IModule module) {`
`89`	`89`	`Map artifactEntries = (Map) serverEntries.get(server.getRuntime().getLocation().toFile());`
`90`		`- if (artifactEntries != null) {`
`91`		`- return (String) artifactEntries.get(module.getProject().getName());`
	`90`	`+ if (artifactEntries != null && module != null) {`
	`91`	`+ if (module.getProject() != null) {`
	`92`	`+ return (String) artifactEntries.get(module.getProject()`
	`93`	`+ .getName());`
	`94`	`+ } else {`
	`95`	`+ return (String) artifactEntries.get(module.getName());`
	`96`	`+ }`
`92`	`97`	`}`
`93`	`98`	`return null;`
`94`	`99`	`}`