[SCM-913] NPE on ChangeSet.toString() when no mergedRevisions are set

apache · May 19, 2022 · 92a0912 · 92a0912
1 parent 68dd194
commit 92a0912
Showing 1 changed file with 3 additions and 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
@@ -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 String toString()
         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" );
         }