| commit | 6c46702d9228394fa6456fe4a72527aa55f43da9 | [log] [tgz] |
|---|---|---|
| author | Wendy Smoak <wsmoak@apache.org> | Sun Sep 21 23:25:20 2008 +0000 |
| committer | Wendy Smoak <wsmoak@apache.org> | Sun Sep 21 23:25:20 2008 +0000 |
| tree | 46cc571e8201ca05bd422a04cdce05d22cc02e63 | |
| parent | 3d7e458b60aa08a3473d202fa82da36a8ef0d87a [diff] |
[CONTINUUM-1721] Guard against NPE from now-optional scm element. Note duplicate code. git-svn-id: https://svn.apache.org/repos/asf/continuum/branches/CONTINUUM-1721@697637 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java b/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java index 6f304fd..eeabad7 100644 --- a/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java +++ b/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
@@ -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() ); }
diff --git a/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java b/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java index 39f1cb3..9b882b1 100644 --- a/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java +++ b/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
@@ -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() ); }