GROOVY-11874: add null check

5_0_X backport

Author: eric-milles

src/main/java/groovy/lang/MetaClassImpl.java

@@ -113,7 +113,6 @@
 import java.util.function.BiConsumer;
 
 import static groovy.lang.Tuple.tuple;
-import static java.lang.Character.isUpperCase;
 import static org.apache.groovy.ast.tools.ClassNodeUtils.isValidAccessorName;
 import static org.apache.groovy.util.Arrays.concat;
 import static org.codehaus.groovy.ast.tools.GeneralUtils.inSamePackage;
@@ -2132,8 +2131,11 @@ private boolean isVisibleProperty(final MetaProperty field, final MetaMethod met
     private Tuple2<MetaMethod, MetaProperty> createMetaMethodAndMetaProperty(final Class<?> sender, final String name, final boolean useSuper, final boolean isStatic) {
         MetaMethod method = null;
         MetaProperty mp = getMetaProperty(sender, name, useSuper, isStatic);
-        if ((mp == null || mp instanceof CachedField) && !name.isEmpty() && isUpperCase(name.charAt(0)) && (name.length() < 2 || !isUpperCase(name.charAt(1))) && !"Class".equals(name) && !"MetaClass".equals(name)) {
-            // GROOVY-9618 adjust because capitalised properties aren't stored as meta bean props
+
+        if ((mp == null || mp instanceof CachedField)
+                && name != null && !name.isEmpty() && Character.isUpperCase(name.charAt(0)) // GROOVY-11874
+                && (name.length() == 1 || (!Character.isUpperCase(name.charAt(1)) && !name.equals("Class") && !name.equals("MetaClass"))) ) {
+            // GROOVY-9618: adjust because capitalised properties aren't stored as meta bean props
             MetaProperty saved = mp;
             mp = getMetaProperty(sender, BeanUtils.decapitalize(name), useSuper, isStatic);
             if (mp == null || (saved != null && mp instanceof CachedField)) {

src/test/groovy/groovy/transform/stc/ArraysAndCollectionsSTCTest.groovy

@@ -1008,6 +1008,15 @@ class ArraysAndCollectionsSTCTest extends StaticTypeCheckingTestCase {
         '''
     }
 
+    // GROOVY-11874
+    void testMapGetAt() {
+        assertScript '''
+            String name = null
+            def map = [:]
+            map[name]
+        '''
+    }
+
     // GROOVY-6266
     void testMapGenerics() {
         assertScript '''