commit 298d326e35b33a82bcc5db09734c15a3938489a8
author Daniele Moro <daniele@opennetworking.org> Tue Feb 16 12:54:06 2021 +0100
committer Carmelo Cascone <carmelo@opennetworking.org> Wed Feb 17 23:00:07 2021 +0000
tree 1421037dd063e13d4ffb136314992610a7832ec8
parent 197fd408683e1bcb86be4cb84baec4acccaba92e

Fix bug when reading table entries

Check if table has counter only if not all tables wildcard read.

Change-Id: I1a15e578bb55eaaf0b1ce4e1c509a6ec0334292b

protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/client/ReadRequestImpl.java

diff --git a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/client/ReadRequestImpl.java b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/client/ReadRequestImpl.java
index 9ca268c..48840f4 100644
--- a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/client/ReadRequestImpl.java
+++ b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/client/ReadRequestImpl.java
@@ -301,10 +301,9 @@
             builder.setMeterConfig(P4RuntimeOuterClass.MeterConfig.getDefaultInstance());
         } else {
             builder.setTableId(p4TableId(piTableId));
-        }
-        if (tableHasCounters(piTableId)) {
-            builder.setCounterData(P4RuntimeOuterClass.CounterData
-                                           .getDefaultInstance());
+            if (tableHasCounters(piTableId)) {
+                builder.setCounterData(P4RuntimeOuterClass.CounterData.getDefaultInstance());
+            }
         }
         final var entityMsg = P4RuntimeOuterClass.Entity
                 .newBuilder().setTableEntry(builder.build()).build();