You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/04/24 17:41:53 UTC
svn commit: r1329801 -
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
Author: olamy
Date: Tue Apr 24 15:41:53 2012
New Revision: 1329801
URL: http://svn.apache.org/viewvc?rev=1329801&view=rev
Log:
jazz provider: if date parsing failed with user locale try again with ENGLISH locale.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java?rev=1329801&r1=1329800&r2=1329801&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java Tue Apr 24 15:41:53 2012
@@ -32,6 +32,7 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
+import java.util.Locale;
/**
* Consume the output of the scm command for the "list changesets" operation.
@@ -138,10 +139,10 @@ public class JazzListChangesetConsumer
private static final String HEADER_CHANGES = "Changes:";
private static final String JAZZ_TIMESTAMP_PATTERN = "MMM d, yyyy h:mm a";
- // Actually: DateFormat.getDateTimeInstance( DateFormat.MEDIUM, DateFormat.SHORT );
+ // Actually: DateFormat.getDateTimeInstance( DateFormat.MEDIUM, DateFormat.SHORT );
private static final String JAZZ_TIMESTAMP_PATTERN_TIME = "h:mm a";
- // Only seen when the data = today. Only the time is displayed.
+ // Only seen when the data = today. Only the time is displayed.
// (1589) ---$ Deb "[maven-release-plugin] prepare for next development iteration"
// (1585) ---$ Deb "[maven-release-plugin] prepare release GPDB-1.0.21"
@@ -355,9 +356,12 @@ public class JazzListChangesetConsumer
if ( date != null )
{
- Date changesetDate = null;
-
- changesetDate = parseDate( date.toString(), userDateFormat, JAZZ_TIMESTAMP_PATTERN );
+ Date changesetDate = parseDate( date.toString(), userDateFormat, JAZZ_TIMESTAMP_PATTERN );
+ // try again forcing en locale
+ if ( changesetDate == null )
+ {
+ changesetDate = parseDate( date.toString(), userDateFormat, JAZZ_TIMESTAMP_PATTERN, Locale.ENGLISH );
+ }
if ( changesetDate == null )
{
// changesetDate will be null when the date is not given, it only has just the time. The date is today.