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 ev...@apache.org on 2006/03/08 17:40:22 UTC
svn commit: r384263 -
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java
Author: evenisse
Date: Wed Mar 8 08:40:20 2006
New Revision: 384263
URL: http://svn.apache.org/viewcvs?rev=384263&view=rev
Log:
Restore localFormat use removed in last commit.
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java?rev=384263&r1=384262&r2=384263&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogConsumer.java Wed Mar 8 08:40:20 2006
@@ -279,7 +279,16 @@
String date = line.substring( posDateTag + DATE_TAG.length() );
- getCurrentChange().setDate( parseDate( date, userDateFormat, null ) );
+ Date dateObj = parseDate( date, userDateFormat, localFormat.toPattern() );
+
+ if ( dateObj != null )
+ {
+ getCurrentChange().setDate( dateObj );
+ }
+ else
+ {
+ getCurrentChange().setDate( date, userDateFormat );
+ }
setStatus( GET_COMMENT );
}