commit d4066ea7fcf65ce9f1b426ffa26ed7a950340593
author Jian Li <pyguni@gmail.com> Thu Jun 07 01:44:45 2018 +0900
committer Jian Li <pyguni@gmail.com> Thu Jun 07 05:41:39 2018 +0000
tree bf17f679b41a94a78e771dc0a320205adb0e6dbc
parent de679788842c2694221ca333e8db4262dd8df395

Bugfix: resolve a NPE caused by quering a non-existing router MAC

Change-Id: Ie059690efd697341b7c9de4a61a1ce8b20e9734f

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java
index 205602d..94669ed 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java
@@ -442,12 +442,12 @@
         try {
             externalPeerRouterMap.computeIfPresent(ipAddress.toString(), (id, existing) ->
                 new DefaultExternalPeerRouter(ipAddress, macAddress, existing.externalPeerRouterVlanId()));
+
+            log.info("Updated external peer router map {}",
+                    externalPeerRouterMap.get(ipAddress.toString()).value().toString());
         } catch (Exception e) {
             log.error("Exception occurred because of {}", e.toString());
         }
-
-        log.info("Updated external peer router map {}",
-                externalPeerRouterMap.get(ipAddress.toString()).value().toString());
     }