GERONIMODEVTOOLS-689 NullPointerException when publishing with Geronimo Eclipse Plugin v2.1.7

Hong Fang Han · Hong Fang Han · commit dbbaf03be7c4 · 2010-12-20T07:49:05.000Z
git-svn-id: https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/branches/2.1@1051013 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java b/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java
@@ -438,8 +438,10 @@ else if (GeronimoUtils.isRARModule(module)) {
             }
         }
 
-        //put module's environment into the cache for next retrieve
-        environmentCache.put(module, environment);
+		// put module's environment into the cache for next retrieve
+		if (environment != null) {
+			environmentCache.put(module, environment);
+		}
         
         Trace.tracePoint("Exit ", "DependencyHelper.getEnvironment", environment);
         return environment;

Original file line number	Diff line number	Diff line change
`@@ -438,8 +438,10 @@ else if (GeronimoUtils.isRARModule(module)) {`
`438`	`438`	`}`
`439`	`439`	`}`
`440`	`440`
`441`		`- //put module's environment into the cache for next retrieve`
`442`		`- environmentCache.put(module, environment);`
	`441`	`+ // put module's environment into the cache for next retrieve`
	`442`	`+ if (environment != null) {`
	`443`	`+ environmentCache.put(module, environment);`
	`444`	`+ }`
`443`	`445`
`444`	`446`	`Trace.tracePoint("Exit ", "DependencyHelper.getEnvironment", environment);`
`445`	`447`	`return environment;`