You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/04/01 23:10:41 UTC
[maven-scm] branch SCM-879 created (now 40776a7)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch SCM-879
in repository https://gitbox.apache.org/repos/asf/maven-scm.git.
at 40776a7 [SCM-879] JazzChangeLogCommandTest#testListChangesetConsumerWithTimeOnly() fails with NPE on Java 10
This branch includes the following new commits:
new 40776a7 [SCM-879] JazzChangeLogCommandTest#testListChangesetConsumerWithTimeOnly() fails with NPE on Java 10
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
michaelo@apache.org.
[maven-scm] 01/01: [SCM-879]
JazzChangeLogCommandTest#testListChangesetConsumerWithTimeOnly() fails with
NPE on Java 10
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SCM-879
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 40776a73635642e5f74b2896dda83518c5d35319
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Apr 2 01:10:08 2018 +0200
[SCM-879] JazzChangeLogCommandTest#testListChangesetConsumerWithTimeOnly() fails with NPE on Java 10
---
.../jazz/command/changelog/JazzListChangesetConsumer.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
index c324759..5740388 100644
--- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
@@ -127,7 +127,7 @@ public class JazzListChangesetConsumer
private static final int STATE_CHANGES = 4;
- // Header definitions.
+ // Header definitions.
private static final String HEADER_CHANGE_SETS = "Change sets:";
private static final String HEADER_CHANGE_SET = "(";
@@ -344,10 +344,15 @@ public class JazzListChangesetConsumer
{
changesetDate = parseDate( date.toString(), userDateFormat, JAZZ_TIMESTAMP_PATTERN, Locale.ENGLISH );
}
+ // changesetDate will be null when the date is not given, it only has just the time. The date is today.
if ( changesetDate == null )
{
- // changesetDate will be null when the date is not given, it only has just the time. The date is today.
changesetDate = parseDate( date.toString(), userDateFormat, JAZZ_TIMESTAMP_PATTERN_TIME );
+ // try again forcing en locale
+ if ( changesetDate == null )
+ {
+ changesetDate = parseDate( date.toString(), userDateFormat, JAZZ_TIMESTAMP_PATTERN_TIME, Locale.ENGLISH );
+ }
// Get today's time/date. Used to get the date.
Calendar today = Calendar.getInstance();
// Get a working one.
--
To stop receiving notification emails like this one, please contact
michaelo@apache.org.