commit 8bf77b78d78ab73debc0558216da2b6d2b32a8ae
author maojianwei <maojianwei2016@126.com> Mon Feb 15 15:18:24 2016 +0800
committer Mao Jianwei - BUPT <MaoJianwei2012@126.com> Mon Feb 15 09:22:00 2016 +0000
tree 7e8003105693bae5f8a739a797b11d7da28c37ed
parent 39fff107c49c66dcba6151dce629f9789bcf2289

Improve the method to loading configurations from OSGI

To avoid null value error, Use Tools.get() in org.onlab.util.Tools to load configs safely.

Refer to https://wiki.onosproject.org/display/ONOS/Component+Configuration

Change-Id: Ic8ab5bd41d1e374a0abb3c78e94c28df7854b85d

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 bb29e65..6653c63 100644
--- a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
+++ b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
@@ -35,6 +35,7 @@
 import org.onlab.packet.TpPort;
 import org.onlab.packet.UDP;
 import org.onlab.packet.VlanId;
+import org.onlab.util.Tools;
 import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
@@ -372,8 +373,8 @@
                                               String propertyName) {
         Integer value = null;
         try {
-            String s = (String) properties.get(propertyName);
-            value = isNullOrEmpty(s) ? value : Integer.parseInt(s.trim());
+            String s = Tools.get(properties, propertyName);
+            value = isNullOrEmpty(s) ? value : Integer.parseInt(s);
         } catch (NumberFormatException | ClassCastException e) {
             value = null;
         }
@@ -391,10 +392,8 @@
                                              String propertyName) {
         boolean enabled = false;
         try {
-            String flag = (String) properties.get(propertyName);
-            if (flag != null) {
-                enabled = flag.trim().equals("true");
-            }
+            String flag = Tools.get(properties, propertyName);
+            enabled = isNullOrEmpty(flag) ? enabled : flag.equals("true");
         } catch (ClassCastException e) {
             // No propertyName defined.
             enabled = false;