Merge pull request #2367 from square/juho/fix-npe-in-fds-gen

jvmakine · web-flow · commit 83dc35edf9cf · 2023-01-10T16:12:26.000+11:00
fix: options entries can be null for files imported from external jars
diff --git a/wire-library/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/Options.kt b/wire-library/wire-schema/src/commonMain/kotlin/com/squareup/wire/schema/Options.kt
@@ -38,7 +38,7 @@ class Options(
     }
 
   val map: Map<ProtoMember, Any?>
-    get() = entries!!.toMap()
+    get() = entries?.toMap() ?: emptyMap()
 
   fun retainLinked() = Options(optionType, emptyList())
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class Options(`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`val map: Map<ProtoMember, Any?>`
`41`		`- get() = entries!!.toMap()`
	`41`	`+ get() = entries?.toMap() ?: emptyMap()`
`42`	`42`
`43`	`43`	`fun retainLinked() = Options(optionType, emptyList())`
`44`	`44`