You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by da...@apache.org on 2007/12/31 21:23:37 UTC
svn commit: r607771 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam: ./
src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
Author: dantran
Date: Mon Dec 31 12:23:36 2007
New Revision: 607771
URL: http://svn.apache.org/viewvc?rev=607771&view=rev
Log:
Fix NPE related to CONTINUUM-1521
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/ (props changed)
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec 31 12:23:36 2007
@@ -7,3 +7,4 @@
*.iws
*.iml
.wtpmodules
+.settings
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java?rev=607771&r1=607770&r2=607771&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java Mon Dec 31 12:23:36 2007
@@ -54,7 +54,7 @@
throws ScmException
{
- if ( branch != null || StringUtils.isNotEmpty( branch.getName() ) )
+ if ( branch != null || StringUtils.isNotEmpty( (branch==null)?null:branch.getName() ) )
{
this.getLogger().warn( "This provider doesn't support changelog with on a given branch." );
}