package org.fakereplace.runtime;

import java.io.Serializable;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

/**
 * Map implementation that wraps ConcurrentHashMap
 * but allows for null values in put and get
 * 
 * @author stuart
 * 
 * @param <K>
 * @param <V>
 */
public class NullSafeConcurrentHashMap<K, V> implements Map<K, V>, Serializable
{
   final ConcurrentHashMap<K, V> map = new ConcurrentHashMap<K, V>();

   final Object NULL_VALUE = new Object();

   public void clear()
   {
      map.clear();
   }

   public boolean containsKey(Object key)
   {
      return map.contains(key);
   }

   public boolean containsValue(Object value)
   {
      return map.containsValue(value);
   }

   public Set<java.util.Map.Entry<K, V>> entrySet()
   {
      return map.entrySet();
   }

   public V get(Object key)
   {
      V val = map.get(key);
      if (val == NULL_VALUE)
      {
         return null;
      }
      return val;
   }

   public boolean isEmpty()
   {
      return map.isEmpty();
   }

   public Set<K> keySet()
   {
      return map.keySet();
   }

   public V put(K key, V value)
   {
      if (value == null)
      {
         value = (V) NULL_VALUE;
      }
      return map.put(key, value);
   }

   public void putAll(Map<? extends K, ? extends V> m)
   {
      map.putAll(m);
   }

   public V remove(Object key)
   {
      return map.remove(key);
   }

   public int size()
   {
      return map.size();
   }

   public Collection<V> values()
   {
      return map.values();
   }
}

@@ -497,22 +497,28 @@
   final 
-Object
+Serializable
  NULL_VA
@@ -531,16 +531,32 @@
 new 
-Object()
+Serializable()%0A   %7B%0A   %7D
 ;%0A%0A 

make the map serialisable