Return-Path: Delivered-To: apmail-maven-scm-commits-archive@www.apache.org Received: (qmail 52931 invoked from network); 31 Dec 2007 20:24:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Dec 2007 20:24:00 -0000 Received: (qmail 38557 invoked by uid 500); 31 Dec 2007 20:23:49 -0000 Delivered-To: apmail-maven-scm-commits-archive@maven.apache.org Received: (qmail 38525 invoked by uid 500); 31 Dec 2007 20:23:49 -0000 Mailing-List: contact scm-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: scm-dev@maven.apache.org Delivered-To: mailing list scm-commits@maven.apache.org Received: (qmail 38512 invoked by uid 99); 31 Dec 2007 20:23:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Dec 2007 12:23:49 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Dec 2007 20:23:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 910991A984E; Mon, 31 Dec 2007 12:23:37 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Mon, 31 Dec 2007 20:23:37 -0000 To: scm-commits@maven.apache.org From: dantran@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071231202337.910991A984E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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." ); }