commit 215f245e74cf095bf3ddd70477505d921089f89f
author ke han <Ke.Han@alcatel-sbell.com.cn> Fri Apr 28 13:36:05 2017 +0800
committer Jian Li <pyguni@gmail.com> Fri May 05 13:09:09 2017 +0000
tree cb9ed50430da0809e9ee5267ce23dcdbbbd71432
parent 38bb1095cbd1264bdc4f1e7e0c2f852c61b858d0

the port in action field is optional for qos flow rule

Change-Id: Ia590bcb94b20f917ad12b02d6c68da56aea0a233

core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java

diff --git a/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
index f523430..5393eef 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/EncodeInstructionCodecHelper.java
@@ -301,7 +301,9 @@
                 final Instructions.SetQueueInstruction setQueueInstruction =
                         (Instructions.SetQueueInstruction) instruction;
                 result.put(InstructionCodec.QUEUE_ID, setQueueInstruction.queueId());
-                result.put(InstructionCodec.PORT, setQueueInstruction.port().toString());
+                if (setQueueInstruction.port() != null) {
+                    result.put(InstructionCodec.PORT, setQueueInstruction.port().toString());
+                }
                 break;
 
             case L0MODIFICATION: