Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 27414 invoked from network); 20 Dec 2010 07:49:29 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Dec 2010 07:49:29 -0000 Received: (qmail 41797 invoked by uid 500); 20 Dec 2010 07:49:29 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 41664 invoked by uid 500); 20 Dec 2010 07:49:27 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 41656 invoked by uid 99); 20 Dec 2010 07:49:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Dec 2010 07:49:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Dec 2010 07:49:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B8D6423889B9; Mon, 20 Dec 2010 07:49:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1051013 - /geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java Date: Mon, 20 Dec 2010 07:49:05 -0000 To: scm@geronimo.apache.org From: hanhongfang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101220074905.B8D6423889B9@eris.apache.org> Author: hanhongfang Date: Mon Dec 20 07:49:05 2010 New Revision: 1051013 URL: http://svn.apache.org/viewvc?rev=1051013&view=rev Log: GERONIMODEVTOOLS-689 NullPointerException when publishing with Geronimo Eclipse Plugin v2.1.7 Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java Modified: geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java?rev=1051013&r1=1051012&r2=1051013&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java (original) +++ geronimo/devtools/eclipse-plugin/branches/2.1/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java Mon Dec 20 07:49:05 2010 @@ -438,8 +438,10 @@ public class DependencyHelper { } } - //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;