commit e5d0bf136a713edd08f7610e00111a26746f707e
author TeruU <t-uchida@onlab.us> Wed May 28 17:50:02 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Thu May 29 11:18:02 2014 -0700
tree f2dadf3b5f2303375799a0dda0cb4bc97c6a930b
parent e748eccde6a10b1a4809f6494a0e54026e957b64

Fix an idle timeout issue.
When only one swich topology, the timeout value was set to +2 sec value of an user actually set.

Change-Id: I767208f3f337a462b1f5f0d04111cd8f1dea0810

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 b7497fa..ddff381 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
@@ -122,8 +122,13 @@
                     log.trace("cookieId is set: {}", cookieId);
                     fe.setFlowEntryId(cookieId);
                 }
-                fe.setIdleTimeout(idleTimeout);
-                fe.setHardTimeout(hardTimeout);
+                if (sw != firstSrcSw) {
+                    fe.setIdleTimeout(idleTimeout);
+                    fe.setHardTimeout(hardTimeout);
+                } else {
+                    fe.setIdleTimeout(firstSwitchIdleTimeout);
+                    fe.setHardTimeout(firstSwitchHardTimeout);
+                }
                 entries.add(fe);
             }
             // install flow entries in reverse order