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 ol...@apache.org on 2010/06/08 22:15:04 UTC
svn commit: r952799 -
/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/blame/CvsBlameConsumer.java
Author: olamy
Date: Tue Jun 8 20:15:03 2010
New Revision: 952799
URL: http://svn.apache.org/viewvc?rev=952799&view=rev
Log:
[SCM-551] Blame command : Unparseable date when locale is not US
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/blame/CvsBlameConsumer.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/blame/CvsBlameConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/blame/CvsBlameConsumer.java?rev=952799&r1=952798&r2=952799&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/blame/CvsBlameConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/blame/CvsBlameConsumer.java Tue Jun 8 20:15:03 2010
@@ -22,6 +22,7 @@ package org.apache.maven.scm.provider.cv
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
import org.apache.maven.scm.command.blame.BlameLine;
import org.apache.maven.scm.log.ScmLogger;
@@ -66,7 +67,7 @@ public class CvsBlameConsumer
String author = lineRegexp.getParen( 2 ).trim();
String dateTimeStr = lineRegexp.getParen( 3 ).trim();
- Date dateTime = parseDate( dateTimeStr, null, CVS_TIMESTAMP_PATTERN );
+ Date dateTime = parseDate( dateTimeStr, null, CVS_TIMESTAMP_PATTERN, Locale.US );
getLines().add( new BlameLine( dateTime, revision, author ) );
if ( getLogger().isDebugEnabled() )