| commit | b1224ab24f23de4d2f342ebfeb3acf4c7c615246 | [log] [tgz] |
|---|---|---|
| author | Ayaka Koshibe <ayaka@onlab.us> | Sat Jan 31 00:48:58 2015 +0000 |
| committer | Pavlin Radoslavov <pavlin@onlab.us> | Sat Jan 31 00:54:29 2015 +0000 |
| tree | 1bdcf11aa5bdea43b5a3a01a16f7cfb0be32c93b | |
| parent | 36c936b13473d52d8b8d704e3f6203185816fb15 [diff] [blame] |
Revert "FlowRule equals() incorporates FlowId to factor in treatment." Using Flow ID forces a dependency on the Group/App ID. This reverts commit 38f8c232295c33a455887366469f81c874bdef94. Change-Id: Ib08166c8f778228ebbb68f98c763fcc57a9d6771
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 cd937f4..e555794 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
@@ -203,8 +203,7 @@ DefaultFlowRule that = (DefaultFlowRule) obj; return Objects.equals(deviceId, that.deviceId) && Objects.equals(priority, that.priority) && - Objects.equals(selector, that.selector) && - Objects.equals(id, that.id()); + Objects.equals(selector, that.selector); } return false;