commit 8ef6d3b9a09b4a9cf9d4d9e847651c87b413573b
author Jonathan Hart <jono@onlab.us> Sun Mar 08 21:21:27 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed Mar 11 20:08:45 2015 +0000
tree c3cda21db51433f9893df9cd57895cda995f9dc4
parent 8b6d2d44674a182b13f9ea1b50ddb1be3bf261c2

Minor tweaks to the flow layer.

Prevent DistributedStatistics store from logging "rule has no output" for
rules that transition to other tables.

Change-Id: I85e86965f5609df608cbc19551632153960a5c5b

core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java

diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
index 7249ac0..f35074b 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
@@ -18,6 +18,7 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import org.apache.commons.collections.ListUtils;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.MplsLabel;
@@ -84,6 +85,11 @@
     }
 
     @Override
+    public List<Instruction> allInstructions() {
+        return ListUtils.union(immediate, deferred);
+    }
+
+    @Override
     public Instructions.TableTypeTransition tableTransition() {
         return table;
     }