Revert "Avoid potential NPE"

This reverts commit 467e317.
apache · Jan 3, 2025 · 8ca12ea · 8ca12ea
1 parent b8ff133
commit 8ca12ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy b/subprojects/groovy-jmx/src/main/groovy/groovy/jmx/builder/JmxMetaMapBuilder.groovy
@@ -467,7 +467,7 @@ class JmxMetaMapBuilder {
                     if (descriptor && descriptor instanceof Map) {
                         // foo:[params:["paramTypeName0":[name:"",desc:""], paramTypeNameN[:]]]
                         if (descriptor.params && descriptor.params instanceof Map) {
-                            params = descriptor?.params?.keySet()?.toList()
+                            params = descriptor?.params.keySet().toList()
                         }
                         // foo:[params:["paramTypeName0",...,"paramTypeNameN"]]
                         if (descriptor.params && descriptor.params instanceof List) {

diff --git a/...ojects/groovy-typecheckers/src/main/groovy/groovy/typecheckers/FormatStringChecker.groovy b/...ojects/groovy-typecheckers/src/main/groovy/groovy/typecheckers/FormatStringChecker.groovy
@@ -255,7 +255,7 @@ class FormatStringChecker extends GroovyTypeCheckingExtensionSupport.TypeCheckin
             }
 
             void checkBadFlags(flagList, conversion, Expression target, String badFlags) {
-                def mismatched = flagList?.findAll { badFlags.contains(it) }?.join()
+                def mismatched = flagList?.findAll { badFlags.contains(it) }.join()
                 if (mismatched) {
                     addStaticTypeError("FormatFlagsConversionMismatch: Conversion = $conversion, Flags = '$mismatched'", target)
                 }