commit bbdf4ba0cd38ab8e3f3ca4ebd0690fcc148f0c25
author Daniel Park <dan.mcpark84@gmail.com> Mon Jul 23 16:23:42 2018 +0900
committer Jian Li <pyguni@gmail.com> Mon Jul 23 09:29:31 2018 +0000
tree 783750d588db28ba6af6dc252be2d29dbf7f3c35
parent 9598538c52f488d1fdd35ad72c6f2d43cb1b7a31

Avoids NPE case at OpenstackNetworkingUiMessageHandler.

Change-Id: Ib78847a8601b85fd700f8b32d4795583a26cb810

apps/openstacknetworkingui/src/main/java/org/onosproject/openstacknetworkingui/OpenstackNetworkingUiMessageHandler.java

diff --git a/apps/openstacknetworkingui/src/main/java/org/onosproject/openstacknetworkingui/OpenstackNetworkingUiMessageHandler.java b/apps/openstacknetworkingui/src/main/java/org/onosproject/openstacknetworkingui/OpenstackNetworkingUiMessageHandler.java
index 8668096..86c4f44 100644
--- a/apps/openstacknetworkingui/src/main/java/org/onosproject/openstacknetworkingui/OpenstackNetworkingUiMessageHandler.java
+++ b/apps/openstacknetworkingui/src/main/java/org/onosproject/openstacknetworkingui/OpenstackNetworkingUiMessageHandler.java
@@ -125,8 +125,6 @@
     private OpenstackNodeService osNodeService;
     private InstancePortService instancePortService;
     private OpenstackNetworkService osNetService;
-    private String restUrl;
-    private String restAuthInfo;
     private Mode currentMode = Mode.IDLE;
     private Element elementOfNote;
 
@@ -171,7 +169,8 @@
             switch (mode) {
                 case MOUSE:
                     currentMode = Mode.MOUSE;
-                    sendMouseData();
+                    eventExecutor.execute(() -> sendMouseData());
+
                     break;
 
                 default:
@@ -197,8 +196,7 @@
                     dstIp,
                     srcDeviceId,
                     dstDeviceId);
-
-            processFlowTraceRequest(srcIp, dstIp, srcDeviceId, dstDeviceId);
+            eventExecutor.execute(() -> processFlowTraceRequest(srcIp, dstIp, srcDeviceId, dstDeviceId));
         }
     }
 
@@ -212,9 +210,9 @@
             String id = string(payload, ID);
             log.debug("Update Display: id [{}]", id);
             if (!Strings.isNullOrEmpty(id)) {
-                updateForMode(id);
+                eventExecutor.execute(() -> updateForMode(id));
             } else {
-                clearForMode();
+                eventExecutor.execute(() -> clearForMode());
             }
         }
     }
@@ -275,6 +273,11 @@
         sendMessage(TopoJson.highlightsMessage(highlights));
     }
 
+    /**
+     * Sends JSON-based message to UI.
+     * @param type type
+     * @param payload payload
+     */
     public void sendMessagetoUi(String type, ObjectNode payload) {
         sendMessage(JsonUtils.envelope(type, payload));
     }
@@ -282,7 +285,7 @@
     private int getVni(Host host) {
         String vni = host.annotations().value(ANNOTATION_SEGMENT_ID);
 
-        return vni == null ? 0 : Integer.valueOf(vni).intValue();
+        return vni == null ? 0 : Integer.parseInt(vni);
     }
 
     private void sendMouseData() {
@@ -428,7 +431,7 @@
         Device srcDevice = deviceService.getDevice(srcOpenstackNode.intgBridge());
         if (srcDevice.annotations().value(SW_VERSION).startsWith(OVS_VERSION_2_8)) {
             traceResultForwardJson = Ovs28FlowTraceResultParser.flowTraceResultInJson(
-                    traceResultForward, srcOpenstackNode.hostname());
+                    traceResultForward.trim(), srcOpenstackNode.hostname());
         } else {
             log.error("Currently OVS version {} is not supported",
                     deviceService.getDevice(srcOpenstackNode.intgBridge()));
@@ -519,7 +522,7 @@
             log.error("Exception occurred because of {}", e.toString());
         }
 
-        return traceResult.trim();
+        return traceResult;
     }
 
     private String traceRequestString(String srcIp, String dstIp, OpenstackNode openstackNode) {