[maven-scm] branch master updated: [SCM-913] NPE on ChangeSet.toString() when no mergedRevisions are set

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git


The following commit(s) were added to refs/heads/master by this push:
     new 662b58a7 [SCM-913] NPE on ChangeSet.toString() when no mergedRevisions are set
662b58a7 is described below

commit 662b58a73d49ba2f7d728543ab6a10987b5324da
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu May 19 20:43:19 2022 +0200

    [SCM-913] NPE on ChangeSet.toString() when no mergedRevisions are set
---
 maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java b/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
index e4c40d62..bc22ba2f 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
@@ -115,7 +115,7 @@ public class ChangeSet
      * List of ChangeFile
      */
     private List<ChangeFile> files;
-    
+
     /**
      * The SCM revision id for this changeset.
      * @since 1.3
@@ -470,10 +470,10 @@ public class ChangeSet
         if ( parentRevision != null )
         {
             result.append( "parent: " ).append( parentRevision );
-            if ( !mergedRevisions.isEmpty() )
+            if ( !getMergedRevisions().isEmpty() )
             {
                 result.append( " + " );
-                result.append( mergedRevisions );
+                result.append( getMergedRevisions() );
             }
             result.append( "\n" );
         }