commit e3bbe2f33fde8a4c64e4664026a15841cbf2695b
author TeruU <t-uchida@onlab.us> Wed May 28 16:11:30 2014 -0700
committer Terutaka Uchida <t-uchida@onlab.us> Wed May 28 17:10:11 2014 -0700
tree 552bf29c0e4eacd0644a0bd49b53f6cbe6ed6fa5
parent 8500fc0774775d09b208c17ea4dfc3d4fa8cc6c3

Fixed a cookie id handling issue that was not written it into the last switch. 
When only one switch topology, it affected to flow removed event handling and could not handle flow removed event properly.

Change-Id: I729958333a42fe690083bdc9bdaf44b42ef2aba6

src/main/java/net/onrc/onos/core/intent/runtime/PlanCalcRuntime.java

diff --git a/src/main/java/net/onrc/onos/core/intent/runtime/PlanCalcRuntime.java b/src/main/java/net/onrc/onos/core/intent/runtime/PlanCalcRuntime.java
index bbd2555..b7497fa 100644
--- a/src/main/java/net/onrc/onos/core/intent/runtime/PlanCalcRuntime.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PlanCalcRuntime.java
@@ -118,6 +118,10 @@
                 long sw = lastDstSw;
                 dstPort = lastDstPort;
                 FlowEntry fe = new FlowEntry(sw, srcPort, dstPort, srcMac, dstMac, i.operator);
+                if (cookieId != null) {
+                    log.trace("cookieId is set: {}", cookieId);
+                    fe.setFlowEntryId(cookieId);
+                }
                 fe.setIdleTimeout(idleTimeout);
                 fe.setHardTimeout(hardTimeout);
                 entries.add(fe);