From a506ae8b5a63a88886f842bd0722466db67b4f96 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Wed, 11 May 2016 09:20:08 +0200
Subject: Add proper break statements to abstract reader

Change-Id: Iebb52d59e2e342151e616548722366985d7ee9a5
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 .../honeycomb/v3po/translate/impl/read/AbstractCompositeReader.java  | 2 ++
 .../v3po/translate/v3po/interfacesstate/InterfaceUtils.java          | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'v3po')

diff --git a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/AbstractCompositeReader.java b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/AbstractCompositeReader.java
index e8d79c538..f026d4f92 100644
--- a/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/AbstractCompositeReader.java
+++ b/v3po/translate-impl/src/main/java/io/fd/honeycomb/v3po/translate/impl/read/AbstractCompositeReader.java
@@ -87,11 +87,13 @@ abstract class AbstractCompositeReader<D extends DataObject, B extends Builder<D
                 LOG.trace("{}: Reading current attributes", this);
                 readCurrentAttributes(id, builder, ctx);
                 readChildren(id, ctx, builder);
+                break;
             }
             case POSTORDER: {
                 readChildren(id, ctx, builder);
                 LOG.trace("{}: Reading current attributes", this);
                 readCurrentAttributes(id, builder, ctx);
+                break;
             }
         }
 
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtils.java b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtils.java
index 09ea09e47..3db497a5c 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtils.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/honeycomb/v3po/translate/v3po/interfacesstate/InterfaceUtils.java
@@ -162,8 +162,6 @@ public final class InterfaceUtils {
         CompletionStage<SwInterfaceDetailsReplyDump> requestFuture = futureJvpp.swInterfaceDump(request);
         SwInterfaceDetailsReplyDump ifaces = V3poUtils.getReply(requestFuture.toCompletableFuture());
         if (null == ifaces || null == ifaces.swInterfaceDetails || ifaces.swInterfaceDetails.isEmpty()) {
-            LOG.warn("VPP returned null instead of interface by key {}", key.getName());
-            LOG.warn("Iterating through all the interfaces to find interface: {}", key.getName());
             request.nameFilterValid = 0;
 
             // Returned cached if available
@@ -171,6 +169,9 @@ public final class InterfaceUtils {
                 return allInterfaces.get(index);
             }
 
+            LOG.warn("VPP returned null instead of interface by key {} and its not cached", key.getName());
+            LOG.warn("Iterating through all the interfaces to find interface: {}", key.getName());
+
             // Or else just perform full dump and do inefficient filtering
             requestFuture = futureJvpp.swInterfaceDump(request);
             ifaces = V3poUtils.getReply(requestFuture.toCompletableFuture());
-- 
cgit 1.2.3-korg