Author: ssmiweve
Date: 2007-06-03 20:15:22 +0200 (Sun, 03 Jun 2007)
New Revision: 5254

Modified:
   
branches/2.13/data-model-api/src/main/java/no/schibstedsok/searchportal/datamodel/generic/MapDataObjectSupport.java
Log:
from comment to 
https://dev.schibstedsok.no/confluence/display/TECHDEV/Configure+by+annotaion%28draft%29

Modified: 
branches/2.13/data-model-api/src/main/java/no/schibstedsok/searchportal/datamodel/generic/MapDataObjectSupport.java
===================================================================
--- 
branches/2.13/data-model-api/src/main/java/no/schibstedsok/searchportal/datamodel/generic/MapDataObjectSupport.java
 2007-06-01 14:23:14 UTC (rev 5253)
+++ 
branches/2.13/data-model-api/src/main/java/no/schibstedsok/searchportal/datamodel/generic/MapDataObjectSupport.java
 2007-06-03 18:15:22 UTC (rev 5254)
@@ -37,35 +37,16 @@
 @DataObject
 public final class MapDataObjectSupport<V> implements MapDataObject<V>{
 
-    private final Map<String,V> map = new ConcurrentHashMap();
-        /*= new HashMap<String,V>(){
+    private final Map<String,V> map = new ConcurrentHashMap<String,V>(){
 
-        private final ReentrantReadWriteLock lock = new 
ReentrantReadWriteLock();
-
         @Override
-        public V get(final Object key){
-
-            try{
-                lock.readLock().lock();
-                return super.get(key);
-
-            }finally{
-                lock.readLock().unlock();
-            }
-        }
-
-        @Override
         public V put(final String key, final V value){
 
-            try{
-                lock.writeLock().lock();
-                return super.put(key, value);
-
-            }finally{
-                lock.writeLock().unlock();
-            }
+            return null == value
+                ? super.remove(key)
+                : super.put(key, value);
         }
-    };*/
+    };
 
     public MapDataObjectSupport(final Map<String,V> map){
         
@@ -81,16 +62,12 @@
 
     public void setValue(final String key, final V value){
 
-        if(null == value){
-            map.remove(key);
-        }else{
-            map.put(key, value);
-        }
+        map.put(key, value);
     }
 
     public Map<String, V> getValues() {
 
-        //return Collections.unmodifiableMap(map);
+        //XXX return Collections.unmodifiableMap(map);
         return map;
     }
 

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to