Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 33715 invoked from network); 19 Mar 2010 12:31:39 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 19 Mar 2010 12:31:39 -0000 Received: (qmail 39283 invoked by uid 500); 19 Mar 2010 12:31:38 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 39257 invoked by uid 500); 19 Mar 2010 12:31:38 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 39249 invoked by uid 99); 19 Mar 2010 12:31:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Mar 2010 12:31:38 +0000 X-ASF-Spam-Status: No, hits=-1358.0 required=10.0 tests=ALL_TRUSTED,AWL 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; Fri, 19 Mar 2010 12:31:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 960D62388900; Fri, 19 Mar 2010 12:31:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r925200 - /portals/jetspeed-2/portal/trunk/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java Date: Fri, 19 Mar 2010 12:31:17 -0000 To: jetspeed-dev@portals.apache.org From: ate@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100319123117.960D62388900@eris.apache.org> Author: ate Date: Fri Mar 19 12:31:17 2010 New Revision: 925200 URL: http://svn.apache.org/viewvc?rev=925200&view=rev Log: guard against empty property definitions which would cause NPE in Hashtable.put Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java?rev=925200&r1=925199&r2=925200&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java (original) +++ portals/jetspeed-2/portal/trunk/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java Fri Mar 19 12:31:17 2010 @@ -261,6 +261,17 @@ public class MvnMojo extends AbstractMoj { t.settingsFile = interpolateRootDir(t.settingsFile); } + // make sure target properties are valid + if (t.properties != null) + { + for (Iterator iter = t.properties.keySet().iterator(); iter.hasNext(); ) + { + if (t.properties.get(iter.next()) == null) + { + iter.remove(); + } + } + } targetsMap.put(t.id, t); i++; } --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org