From 540b47bdefb25b8edb8481499efcd51d402bd57c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 20 May 2015 21:56:22 +0200 Subject: [PATCH] Guard against null data in AbstractLeafCandidateNode An instance of this class is defunct if data is ever null, as accessors will throw a NPE from Optional.of(). Make sure data passed down is never null, catching any possible offenders. This transitively fixes the transformation functions, as they will throw NPE when they get a null input, as per Function API contract. Change-Id: I8851e3c68dc9aa5abab4874f019fd214b20c0415 Signed-off-by: Robert Varga --- .../yang/data/impl/schema/tree/AbstractLeafCandidateNode.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractLeafCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractLeafCandidateNode.java index 41e6eb4185..1807639616 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractLeafCandidateNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractLeafCandidateNode.java @@ -8,6 +8,7 @@ package org.opendaylight.yangtools.yang.data.impl.schema.tree; import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import java.util.Collection; import java.util.Collections; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; @@ -18,7 +19,7 @@ abstract class AbstractLeafCandidateNode implements DataTreeCandidateNode { private final NormalizedNode data; protected AbstractLeafCandidateNode(final NormalizedNode data) { - this.data = data; + this.data = Preconditions.checkNotNull(data); } protected final Optional> dataOptional() { -- 2.36.6