AtlasOfLivingAustralia/fieldcapture#3049

temi · temi · commit 2f253c59bbbc · 2024-04-24T07:15:33.000+10:00
- fixes null pointer exception
diff --git a/src/main/groovy/au/org/ala/ecodata/converter/RecordConverter.groovy b/src/main/groovy/au/org/ala/ecodata/converter/RecordConverter.groovy
@@ -151,8 +151,8 @@ class RecordConverter {
     public static Map overrideFieldValues(Map source, Map additional) {
 
         Map result = [:]
-        result << source
-        result << additional
+        result << (source ?: [:])
+        result << (additional ?: [:])
 
         result
     }

Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,8 @@ class RecordConverter {`
`151`	`151`	`public static Map overrideFieldValues(Map source, Map additional) {`
`152`	`152`
`153`	`153`	`Map result = [:]`
`154`		`- result << source`
`155`		`- result << additional`
	`154`	`+ result << (source ?: [:])`
	`155`	`+ result << (additional ?: [:])`
`156`	`156`
`157`	`157`	`result`
`158`	`158`	`}`