commit cc4754d046b645ba7448f7e314344854d72179c8
author Charles Chan <rascov@gmail.com> Thu Dec 10 15:58:18 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Dec 11 15:52:49 2015 +0000
tree 08e07a1df4f8f4e8b50d45ce98b65eaede5d9f81
parent be5c24cd2a766aa934d3d8caa4fb78ce1c75bc0a

ONOS-3593 Fix NPE when selector or treatment is not assigned in FlowRule.Builder

Change-Id: I4dc1257ddcb67f43fadf16f56b517db84a74b83f

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

diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java
index 1164e05..64ebcd9 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java
@@ -301,8 +301,8 @@
         private Integer priority;
         private DeviceId deviceId;
         private Integer tableId = 0;
-        private TrafficSelector selector;
-        private TrafficTreatment treatment;
+        private TrafficSelector selector = DefaultTrafficSelector.builder().build();
+        private TrafficTreatment treatment = DefaultTrafficTreatment.builder().build();
         private Integer timeout;
         private Boolean permanent;