From d8489c4d78acba2ed6b470df564c5ed2e740422a Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Wed, 14 Sep 2016 14:49:56 +0200 Subject: Fix ClassifySession read NPE when NodeContext is missing Change-Id: Ieca5ad125df5f26f82351871a0238e65be3e300c Signed-off-by: Marek Gradzki --- .../v3po/vppclassifier/VppClassifierContextManagerImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManagerImpl.java') diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManagerImpl.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManagerImpl.java index 9f61ab021..e1bf50107 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManagerImpl.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/translate/v3po/vppclassifier/VppClassifierContextManagerImpl.java @@ -28,6 +28,7 @@ import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; import io.fd.honeycomb.translate.util.RWUtils; import io.fd.honeycomb.translate.util.read.BindingBrokerReader; +import java.util.List; import java.util.stream.Collector; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -149,7 +150,11 @@ public final class VppClassifierContextManagerImpl implements VppClassifierConte } final String tableName = getTableName(tableIndex, ctx); final Optional tableCtx = ctx.read(getMappingIid(tableName)); - return Optional.fromNullable(tableCtx.get().getNodeContext().stream() + final List nodeContext = tableCtx.get().getNodeContext(); + if (nodeContext == null) { + return Optional.absent(); + } + return Optional.fromNullable(nodeContext.stream() .filter(n -> n.getIndex().equals(nodeIndex)) .findFirst() .map(nodes -> nodes.getName()) -- cgit 1.2.3-korg