From: Robert Varga <rovarga@cisco.com>
Date: Fri, 30 Dec 2016 12:18:07 +0000 (+0100)
Subject: BUG-7464: Expose MainNode(prev) constructor
X-Git-Tag: release/carbon~169
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=7700695408dbf593192b4bd3f2aae5fabfa1c968;p=yangtools.git

BUG-7464: Expose MainNode(prev) constructor

FailedNode wants to initialize previous node in its constructor,
hence expose the appropriate overload, preventing another volatile
write.

Change-Id: I1f8889e91a9e7e96173863e60df76d9156e1faa5
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/FailedNode.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/FailedNode.java
index a766c251d5..74185053dd 100644
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/FailedNode.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/FailedNode.java
@@ -19,8 +19,8 @@ final class FailedNode<K, V> extends MainNode<K, V> {
     private final MainNode<K, V> p;
 
     FailedNode(final MainNode<K, V> p) {
+        super(p);
         this.p = p;
-        WRITE_PREV(p);
     }
 
     @Override
diff --git a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/MainNode.java b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/MainNode.java
index dca11eeeb5..fcc747160f 100644
--- a/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/MainNode.java
+++ b/third-party/triemap/src/main/java/org/opendaylight/yangtools/triemap/MainNode.java
@@ -22,7 +22,15 @@ abstract class MainNode<K, V> extends BasicNode {
     private static final AtomicReferenceFieldUpdater<MainNode, MainNode> PREV_UPDATER =
         AtomicReferenceFieldUpdater.newUpdater(MainNode.class, MainNode.class, "prev");
 
-    private volatile MainNode<K, V> prev = null;
+    private volatile MainNode<K, V> prev;
+
+    MainNode() {
+        this.prev = null;
+    }
+
+    MainNode(final MainNode<K, V> prev) {
+        this.prev = prev;
+    }
 
     abstract int cachedSize(TrieMap<K, V> ct);