From 0c49a762a2aee374692794a5074723ec5be1e01a Mon Sep 17 00:00:00 2001
From: sjfink <sjfink@f5eafffb-2e1d-0410-98e4-8ec43c5233c4>
Date: Wed, 9 Jan 2008 17:03:29 +0000
Subject: [PATCH] bug form get(null)

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@2321 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
---
 .../src/com/ibm/wala/util/collections/SmallMap.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/collections/SmallMap.java b/com.ibm.wala.core/src/com/ibm/wala/util/collections/SmallMap.java
index 7445f5cff..3fdf4e223 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/collections/SmallMap.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/collections/SmallMap.java
@@ -112,11 +112,14 @@ public class SmallMap<K,V> implements Map<K,V> {
    */
   @SuppressWarnings("unchecked")
   public V get(Object key) {
-    for (int i = 0; i < size(); i++) {
-      if (keysAndValues[i].equals(key)) {
-        return (V) keysAndValues[size() + i];
+    
+    if (key != null)
+      for (int i = 0; i < size(); i++) {
+        if (keysAndValues[i] != null && keysAndValues[i].equals(key)) {
+          return (V) keysAndValues[size() + i];
+        }
       }
-    }
+    
     return null;
   }
 
@@ -142,7 +145,7 @@ public class SmallMap<K,V> implements Map<K,V> {
       Assertions._assert(key != null);
     }
     for (int i = 0; i < size(); i++) {
-      if (keysAndValues[i].equals(key)) {
+      if (keysAndValues[i] != null && keysAndValues[i].equals(key)) {
         V result = (V) keysAndValues[size() + i];
         keysAndValues[size() + i] = value;
         return result;