From 83ea85a47d23d6068750f1a4d20ec8ffe182f32f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 17 Feb 2016 17:55:57 +0100 Subject: [PATCH] Reduce reliance on NormalizedNodeInputStreamReader Use NormalizedNodeDataInput instead. Change-Id: I8c16fcdd1f69354a2616fe89b5a368feea1d3090 Signed-off-by: Robert Varga --- .../cluster/datastore/messages/DataChanged.java | 3 ++- .../cluster/datastore/utils/SerializationUtils.java | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataChanged.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataChanged.java index 6867f46e8d..97231dc366 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataChanged.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataChanged.java @@ -15,6 +15,7 @@ import java.io.ObjectOutput; import java.util.Map; import java.util.Set; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; +import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataInput; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputOutput; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputStreamReader; @@ -45,7 +46,7 @@ public class DataChanged implements Externalizable { public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { in.readShort(); // Read the version - NormalizedNodeInputStreamReader streamReader = new NormalizedNodeInputStreamReader(in); + NormalizedNodeDataInput streamReader = new NormalizedNodeInputStreamReader(in); // Note: the scope passed to builder is not actually used. Builder builder = DOMImmutableDataChangeEvent.builder(DataChangeScope.SUBTREE); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/SerializationUtils.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/SerializationUtils.java index b416b922de..5f84f54b74 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/SerializationUtils.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/SerializationUtils.java @@ -33,7 +33,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; */ public final class SerializationUtils { public static final ThreadLocal REUSABLE_WRITER_TL = new ThreadLocal<>(); - public static final ThreadLocal REUSABLE_READER_TL = new ThreadLocal<>(); + public static final ThreadLocal REUSABLE_READER_TL = new ThreadLocal<>(); public static interface Applier { void apply(T instance, YangInstanceIdentifier path, NormalizedNode node); @@ -49,12 +49,12 @@ public final class SerializationUtils { } private static NormalizedNodeDataInput streamReader(DataInput in) throws IOException { - NormalizedNodeInputStreamReader streamWriter = REUSABLE_READER_TL.get(); - if(streamWriter == null) { - streamWriter = new NormalizedNodeInputStreamReader(in); + NormalizedNodeDataInput streamReader = REUSABLE_READER_TL.get(); + if(streamReader == null) { + streamReader = new NormalizedNodeInputStreamReader(in); } - return streamWriter; + return streamReader; } public static void serializePathAndNode(YangInstanceIdentifier path, NormalizedNode node, -- 2.36.6