geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hanhongf...@apache.org
Subject svn commit: r1058850 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/ org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/ o...
Date Fri, 14 Jan 2011 04:59:43 GMT
Author: hanhongfang
Date: Fri Jan 14 04:59:43 2011
New Revision: 1058850

URL: http://svn.apache.org/viewvc?rev=1058850&view=rev
Log:
GERONIMODEVTOOLS-689 NullPointerException when publishing with Geronimo Eclipse Plugin

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyHelper.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/DependencyHelper.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/DependencyHelper.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyHelper.java?rev=1058850&r1=1058849&r2=1058850&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyHelper.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/internal/DependencyHelper.java
Fri Jan 14 04:59:43 2011
@@ -439,7 +439,9 @@ public class DependencyHelper {
         }
 
         //put module's environment into the cache for next retrieve
-        environmentCache.put(module, environment);
+        if (environment != null) {
+            environmentCache.put(module, environment);
+        } 
         
         Trace.tracePoint("Exit ", "DependencyHelper.getEnvironment", environment);
         return environment;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/DependencyHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/DependencyHelper.java?rev=1058850&r1=1058849&r2=1058850&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/DependencyHelper.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/internal/DependencyHelper.java
Fri Jan 14 04:59:43 2011
@@ -440,7 +440,9 @@ public class DependencyHelper {
         }
         
         //put module's environment into the cache for next retrieve
-        environmentCache.put(module, environment);
+        if (environment != null) {
+            environmentCache.put(module, environment);
+        } 
 
         Trace.tracePoint("Exit ", "DependencyHelper.getEnvironment", environment);
         return environment;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/DependencyHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/DependencyHelper.java?rev=1058850&r1=1058849&r2=1058850&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/DependencyHelper.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/DependencyHelper.java
Fri Jan 14 04:59:43 2011
@@ -439,7 +439,9 @@ public class DependencyHelper {
         }
 
         //put module's environment into the cache for next retrieve
-        environmentCache.put(module, environment);
+        if (environment != null) {
+            environmentCache.put(module, environment);
+        } 
         
         Trace.tracePoint("Exit ", "DependencyHelper.getEnvironment", environment);
         return environment;



Mime
View raw message