Handle AbstractOptions.append( null )

tpietzsch · tpietzsch · commit 3f8fa41be5de · 2020-04-17T16:16:57.000+02:00
diff --git a/src/main/java/org/scijava/optional/AbstractOptions.java b/src/main/java/org/scijava/optional/AbstractOptions.java
@@ -23,6 +23,9 @@ protected T copyOrThis()
 
 	protected T append( final T additionalOptions )
 	{
+		if ( additionalOptions == null )
+			return ( T ) this;
+
 		T concat = copyOrThis();
 		additionalOptions.theOptions.forEach( concat.theOptions::put );
 		return concat;

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,9 @@ protected T copyOrThis()`
`23`	`23`
`24`	`24`	`protected T append( final T additionalOptions )`
`25`	`25`	`{`
	`26`	`+ if ( additionalOptions == null )`
	`27`	`+ return ( T ) this;`
	`28`	`+`
`26`	`29`	`T concat = copyOrThis();`
`27`	`30`	`additionalOptions.theOptions.forEach( concat.theOptions::put );`
`28`	`31`	`return concat;`