홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
Committed by Gerrit Code Review
607b1ff7 1 parent f74ae506

Group ID was set to null in a DefaultFlowRule constructor. 

This is assumed to be not null in some places.

Change-Id: Id3c7f2e71b658c0077f495bf61ed997c98e16acd
Inline Side-by-side
Showing 1 changed file with 7 additions and 7 deletions
...@@ -15,17 +15,17 @@ ...@@ -15,17 +15,17 @@
15 */ 15 */
16 package org.onosproject.net.flow; 16 package org.onosproject.net.flow;
17 17
18 -import static com.google.common.base.MoreObjects.toStringHelper;
19 -import static com.google.common.base.Preconditions.checkArgument;
20 -import static com.google.common.base.Preconditions.checkNotNull;
21 -
22 -import java.util.Objects;
23 -
24 import org.onosproject.core.ApplicationId; 18 import org.onosproject.core.ApplicationId;
25 import org.onosproject.core.DefaultGroupId; 19 import org.onosproject.core.DefaultGroupId;
26 import org.onosproject.core.GroupId; 20 import org.onosproject.core.GroupId;
27 import org.onosproject.net.DeviceId; 21 import org.onosproject.net.DeviceId;
28 22
23 +import java.util.Objects;
24 +
25 +import static com.google.common.base.MoreObjects.toStringHelper;
26 +import static com.google.common.base.Preconditions.checkArgument;
27 +import static com.google.common.base.Preconditions.checkNotNull;
28 +
29 public class DefaultFlowRule implements FlowRule { 29 public class DefaultFlowRule implements FlowRule {
30 30
31 private final DeviceId deviceId; 31 private final DeviceId deviceId;
...@@ -191,7 +191,7 @@ public class DefaultFlowRule implements FlowRule { ...@@ -191,7 +191,7 @@ public class DefaultFlowRule implements FlowRule {
191 191
192 192
193 //FIXME: fields below will be removed. 193 //FIXME: fields below will be removed.
194 - this.groupId = null; 194 + this.groupId = new DefaultGroupId(0);
195 this.payLoad = null; 195 this.payLoad = null;
196 } 196 }
197 197
......