Merge "Bug 576 Fixes of critical issues for YT components"

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/MapAdaptor.java b/common/util/src/main/java/org/opendaylight/yangtools/util/MapAdaptor.java
index 301153afe00fdaec5723d895b76b17271d430444..ebbf488bce89ee0de6c0f133cdcd17d7d4007909 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/MapAdaptor.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/MapAdaptor.java
@@ -8,14 +8,11 @@
 package org.opendaylight.yangtools.util;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Iterables;
 import com.romix.scala.collection.concurrent.TrieMap;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -127,7 +124,7 @@ public final class MapAdaptor {
          */
         if (size == 0) {
             LOG.trace("Reducing input {} to an empty map", input);
-            return Collections.<K, V>emptyMap();
+            return Collections.emptyMap();
         }
 
         /*
@@ -144,7 +141,7 @@ public final class MapAdaptor {
          * map.
          */
         if (useSingleton && size == 1) {
-            final Entry<K, V> e = Iterables.getOnlyElement(input.entrySet());
+            final Entry<K, V> e = input.entrySet().iterator().next();
             final Map<K, V> ret = Collections.singletonMap(e.getKey(), e.getValue());
             LOG.trace("Reducing input {} to singleton map {}", input, ret);
             return ret;

diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ReadOnlyTrieMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ReadOnlyTrieMap.java
index 4d429f1aaa11c899f6759cea472d48dabde75171..0082ff3f5f782191e97c5de564601f4743b44757 100644 (file)
--- a/common/util/src/main/java/org/opendaylight/yangtools/util/ReadOnlyTrieMap.java
+++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ReadOnlyTrieMap.java
@@ -7,14 +7,13 @@
  */
 package org.opendaylight.yangtools.util;
 
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ForwardingMap;
 import com.romix.scala.collection.concurrent.TrieMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A read-only facade in front of a TrieMap. This is what we give out from
@@ -24,6 +23,9 @@ import com.romix.scala.collection.concurrent.TrieMap;
  * changes, we can cache it for future reference.
  */
 final class ReadOnlyTrieMap<K, V> extends ForwardingMap<K, V> {
+    @SuppressWarnings("rawtypes")
+    private static final AtomicReferenceFieldUpdater<ReadOnlyTrieMap, TrieMap> UPDATER =
+            AtomicReferenceFieldUpdater.newUpdater(ReadOnlyTrieMap.class, TrieMap.class, "readOnly");
     private static final Logger LOG = LoggerFactory.getLogger(ReadOnlyTrieMap.class);
     private final TrieMap<K, V> readWrite;
     private final int size;
@@ -45,15 +47,11 @@ final class ReadOnlyTrieMap<K, V> extends ForwardingMap<K, V> {
     protected Map<K, V> delegate() {
         TrieMap<K, V> ret = readOnly;
         if (ret == null) {
-            synchronized (this) {
+            ret = readWrite.readOnlySnapshot();
+            if (!UPDATER.compareAndSet(this, null, ret)) {
                 ret = readOnly;
-                if (ret == null) {
-                    ret = readWrite.readOnlySnapshot();
-                    readOnly = ret;
-                }
             }
         }
-
         return ret;
     }