You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2022/02/01 18:43:40 UTC

[groovy] branch master updated: fix for NPE

This is an automated email from the ASF dual-hosted git repository.

emilles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new 923f680  fix for NPE
923f680 is described below

commit 923f680d769f236a543e622121c7fa3b4badcd56
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Tue Feb 1 12:43:32 2022 -0600

    fix for NPE
    
    java.lang.NullPointerException
    	at org.codehaus.groovy.util.ListHashMap.get(ListHashMap.java:120)
    	at org.codehaus.groovy.ast.NodeMetaDataHandler.getNodeMetaData(NodeMetaDataHandler.java:44)
---
 src/main/java/org/codehaus/groovy/util/ListHashMap.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/codehaus/groovy/util/ListHashMap.java b/src/main/java/org/codehaus/groovy/util/ListHashMap.java
index 92f0f7e..ec2d8b0 100644
--- a/src/main/java/org/codehaus/groovy/util/ListHashMap.java
+++ b/src/main/java/org/codehaus/groovy/util/ListHashMap.java
@@ -114,15 +114,15 @@ public class ListHashMap<K,V> implements Map<K,V> {
 
     @Override
     public V get(Object key) {
-        if(size==0) return null;
-        if (innerMap==null) {
-            for (int i=0; i<size; i++) {
-                if (listKeys[i].equals(key)) return (V) listValues[i];
-            }
+        if (size == 0)
             return null;
-        } else {
+        if (innerMap != null)
             return innerMap.get(key);
+        for (int i = 0; i < size; ++i) {
+            if (key.equals(listKeys[i]))
+                return (V) listValues[i];
         }
+        return null;
     }
 
     @Override