commit 6b5cfec5c49e3e9f48392bc9d1ef9d628802cfb7
author alshabib <alshabibi.ali@gmail.com> Thu Sep 18 17:42:18 2014 -0700
committer alshabib <alshabibi.ali@gmail.com> Thu Sep 18 17:42:18 2014 -0700
tree 4aad1b6283e8e387eff16575e9a353e70fe5ca6b
parent 970449009ca8433af2d8b81d58ea38e40ab7ceb3

stats reported

core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowRule.java

diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowRule.java b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowRule.java
index 564416c..fae1fe3 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowRule.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowRule.java
@@ -2,6 +2,8 @@
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 
+import java.util.Objects;
+
 import org.onlab.onos.net.DeviceId;
 
 public class DefaultFlowRule implements FlowRule {
@@ -12,10 +14,10 @@
     private final TrafficTreatment treatment;
     private final FlowId id;
     private final long created;
-    private long life;
-    private long idle;
-    private long packets;
-    private long bytes;
+    private final long life;
+    private final long idle;
+    private final long packets;
+    private final long bytes;
 
 
     public DefaultFlowRule(DeviceId deviceId,
@@ -32,15 +34,21 @@
         this.created = System.currentTimeMillis();
     }
 
-    // TODO: Decide whether to take the flowId from the underlying flowentry.
     public DefaultFlowRule(DeviceId deviceId, TrafficSelector selector,
             TrafficTreatment treatment, int priority,
-            long life, long idle, long packets, long bytes) {
-        this(deviceId, selector, treatment, priority);
+            long life, long idle, long packets, long bytes, Integer flowId) {
+        this.deviceId = deviceId;
+        this.priority = priority;
+        this.selector = selector;
+        this.treatment = treatment;
+
+        this.id = FlowId.valueOf(flowId);
+
         this.life = life;
         this.idle = idle;
         this.packets = packets;
         this.bytes = bytes;
+        this.created = System.currentTimeMillis();
     }
 
 
@@ -97,11 +105,7 @@
      * @see java.lang.Object#equals(java.lang.Object)
      */
     public int hashCode() {
-        final int prime = 31;
-        int result = prime * this.deviceId().hashCode();
-        result = prime * result + selector.hashCode();
-        result = prime * result + treatment.hashCode();
-        return result;
+        return Objects.hash(deviceId, selector, treatment);
     }
 
     @Override
@@ -140,4 +144,5 @@
                 .toString();
     }
 
+
 }