From b2aa3f4c15e477d6c19bc1c699fa26d208d94e2b Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 21 Jul 2017 11:38:00 +0200
Subject: [PATCH] Fix a few warnings

Change-Id: I8b80c5c38ced7f0c02b4731df7ef94392fbd1868
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../mdsal/dom/spi/DOMDataTreePrefixTableEntry.java            | 2 +-
 .../mdsal/dom/spi/shard/WritableNodeOperation.java            | 4 ++--
 .../dom/spi/store/AbstractDOMStoreTreeChangePublisher.java    | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTableEntry.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTableEntry.java
index 7243b0869d..6f541d460f 100644
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTableEntry.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/DOMDataTreePrefixTableEntry.java
@@ -26,7 +26,7 @@ public final class DOMDataTreePrefixTableEntry<V> implements Identifiable<PathAr
     // FIXME: We do probably want to adapt map
     private final Map<PathArgument, DOMDataTreePrefixTableEntry<V>> children = new HashMap<>();
     private final PathArgument identifier;
-    private V value;
+    private V value = null;
 
     DOMDataTreePrefixTableEntry() {
         identifier = null;
diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WritableNodeOperation.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WritableNodeOperation.java
index 3b23741af1..b563b7f79b 100644
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WritableNodeOperation.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/WritableNodeOperation.java
@@ -84,9 +84,9 @@ public abstract class WritableNodeOperation implements WriteCursorStrategy {
             if (shardChild != null) {
                 // FIXME: Decompose somehow
                 throw new UnsupportedOperationException("Not implemented yet");
-            } else {
-                cursor.merge(childId, child);
             }
+
+            cursor.merge(childId, child);
         }
     }
 
diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java
index bf04f4e9cc..2d9bf97364 100644
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java
@@ -167,7 +167,8 @@ public abstract class AbstractDOMStoreTreeChangePublisher
         }
     }
 
-    private void addToListenerChanges(final Collection<AbstractDOMDataTreeChangeListenerRegistration<?>> registrations,
+    private static void addToListenerChanges(
+            final Collection<AbstractDOMDataTreeChangeListenerRegistration<?>> registrations,
             final YangInstanceIdentifier path, final DataTreeCandidateNode node,
             final Multimap<AbstractDOMDataTreeChangeListenerRegistration<?>, DataTreeCandidate> listenerChanges) {
         final DataTreeCandidate dataTreeCandidate = DataTreeCandidates.newDataTreeCandidate(path, node);
-- 
2.36.6