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

michael-o · michael-o · commit 92a09124c9a0 · 2022-05-19T20:56:53.000+02:00
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" );
         }

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public class ChangeSet`
`115`	`115`	`* List of ChangeFile`
`116`	`116`	`*/`
`117`	`117`	`private List<ChangeFile> files;`
`118`		`-`
	`118`	`+`
`119`	`119`	`/**`
`120`	`120`	`* The SCM revision id for this changeset.`
`121`	`121`	`* @since 1.3`
`@@ -470,10 +470,10 @@ public String toString()`
`470`	`470`	`if ( parentRevision != null )`
`471`	`471`	`{`
`472`	`472`	`result.append( "parent: " ).append( parentRevision );`
`473`		`- if ( !mergedRevisions.isEmpty() )`
	`473`	`+ if ( !getMergedRevisions().isEmpty() )`
`474`	`474`	`{`
`475`	`475`	`result.append( " + " );`
`476`		`- result.append( mergedRevisions );`
	`476`	`+ result.append( getMergedRevisions() );`
`477`	`477`	`}`
`478`	`478`	`result.append( "\n" );`
`479`	`479`	`}`