Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 45232 invoked from network); 21 Sep 2008 23:25:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Sep 2008 23:25:41 -0000 Received: (qmail 42395 invoked by uid 500); 21 Sep 2008 23:25:39 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 42381 invoked by uid 500); 21 Sep 2008 23:25:38 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 42372 invoked by uid 99); 21 Sep 2008 23:25:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Sep 2008 16:25:38 -0700 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; Sun, 21 Sep 2008 23:24:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 15F06238896F; Sun, 21 Sep 2008 16:25:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r697637 - in /continuum/branches/CONTINUUM-1721/continuum-core/src/main/java/org/apache/maven/continuum: execution/maven/m2/DefaultMavenBuilderHelper.java project/builder/maven/MavenTwoContinuumProjectBuilder.java Date: Sun, 21 Sep 2008 23:25:20 -0000 To: commits@continuum.apache.org From: wsmoak@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080921232521.15F06238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wsmoak Date: Sun Sep 21 16:25:20 2008 New Revision: 697637 URL: http://svn.apache.org/viewvc?rev=697637&view=rev Log: [CONTINUUM-1721] Guard against NPE from now-optional scm element. Note duplicate code. Modified: continuum/branches/CONTINUUM-1721/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java continuum/branches/CONTINUUM-1721/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Modified: continuum/branches/CONTINUUM-1721/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1721/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=697637&r1=697636&r2=697637&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1721/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original) +++ continuum/branches/CONTINUUM-1721/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Sun Sep 21 16:25:20 2008 @@ -156,8 +156,9 @@ String scmUrl = getScmUrl( mavenProject ); continuumProject.setScmUrl( scmUrl ); - - if ( !"HEAD".equals( mavenProject.getScm().getTag() ) ) + + //TODO: This code is duplicated in MavenTwoContinuumProjectBuilder + if ( mavenProject.getScm() != null && "HEAD".equals( mavenProject.getScm().getTag() ) ) { continuumProject.setScmTag( mavenProject.getScm().getTag() ); } Modified: continuum/branches/CONTINUUM-1721/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-1721/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=697637&r1=697636&r2=697637&view=diff ============================================================================== --- continuum/branches/CONTINUUM-1721/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original) +++ continuum/branches/CONTINUUM-1721/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Sun Sep 21 16:25:20 2008 @@ -300,7 +300,8 @@ scmUrl = continuumProject.getScmUrl(); } - if ( !"HEAD".equals( mavenProject.getScm().getTag() ) ) + //TODO: This code is duplicated in DefaultMavenBuilderHelper + if ( mavenProject.getScm() != null && "HEAD".equals( mavenProject.getScm().getTag() ) ) { continuumProject.setScmTag( mavenProject.getScm().getTag() ); }