commit b8b8d75e8de314bc8aaadb7f4862081101d90499
author Antonio Marsico <antonio.marsico@create-net.org> Thu Dec 17 16:28:34 2015 +0100
committer Gerrit Code Review <gerrit@onlab.us> Mon Jan 04 18:41:27 2016 +0000
tree c93396bd1ebfd2853bacf21f084cfa55775e37af
parent c49feb4bc17d0dd1893fa527a65f7421425359eb

Fixed setting of flowPriority and flowTimeout default values after scr property-delete

Change-Id: I3988e4912b91b82f56955a3c9868b74c498a03d5

apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java

diff --git a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
index 8540ba1..bb29e65 100644
--- a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
+++ b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
@@ -331,6 +331,7 @@
         Integer flowTimeoutConfigured =
                 getIntegerProperty(properties, "flowTimeout");
         if (flowTimeoutConfigured == null) {
+            flowTimeout = DEFAULT_TIMEOUT;
             log.info("Flow Timeout is not configured, default value is {}",
                      flowTimeout);
         } else {
@@ -341,6 +342,7 @@
         Integer flowPriorityConfigured =
                 getIntegerProperty(properties, "flowPriority");
         if (flowPriorityConfigured == null) {
+            flowPriority = DEFAULT_PRIORITY;
             log.info("Flow Priority is not configured, default value is {}",
                      flowPriority);
         } else {