Return-Path: Delivered-To: apmail-maven-scm-commits-archive@www.apache.org Received: (qmail 54839 invoked from network); 12 Mar 2007 12:44:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Mar 2007 12:44:15 -0000 Received: (qmail 13316 invoked by uid 500); 12 Mar 2007 12:44:18 -0000 Delivered-To: apmail-maven-scm-commits-archive@maven.apache.org Received: (qmail 13297 invoked by uid 500); 12 Mar 2007 12:44:18 -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 13279 invoked by uid 99); 12 Mar 2007 12:44:18 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Mar 2007 05:44:18 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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, 12 Mar 2007 05:44:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6342F1A9838; Mon, 12 Mar 2007 05:43:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r517192 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/ Date: Mon, 12 Mar 2007 12:43:49 -0000 To: scm-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070312124349.6342F1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Mon Mar 12 05:43:48 2007 New Revision: 517192 URL: http://svn.apache.org/viewvc?view=rev&rev=517192 Log: [SCM-278] Fix NPE when endDate is null Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java?view=diff&rev=517192&r1=517191&r2=517192 ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java Mon Mar 12 05:43:48 2007 @@ -90,6 +90,10 @@ endDate = new Date( System.currentTimeMillis() + (long) 1 * 24 * 60 * 60 * 1000 ); } + else if ( endDate == null ) + { + endDate = new Date(); + } return executeChangeLogCommand( repository, fileSet, startDate, endDate, branch, datePattern ); } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java?view=diff&rev=517192&r1=517191&r2=517192 ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java Mon Mar 12 05:43:48 2007 @@ -110,6 +110,11 @@ //Display only versions that fall within specified data range. if ( startDate != null ) { + if ( endDate == null ) + { + endDate = new Date(); // = now + } + SimpleDateFormat sdf = new SimpleDateFormat( "dd/MM/yyyy", Locale.ENGLISH ); String dateRange = sdf.format( endDate ) + "~" + sdf.format( startDate ); command.createArgument().setValue( VssConstants.FLAG_VERSION_DATE + dateRange );