Bug 7023 - NPE at org.opendaylight.ovsdb.southbound.OvsdbConnectionManager.getClient

Change-Id: If157e70dbbbafa39d2334c1704f0ae9d7460bbda
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
index cfad32d3fd6c9275920ec228064b91184ecf93bd..44b6b316ed997adb7d5cb875eb97457b741da826 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
@@ -330,7 +330,11 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
     }
 
     public OvsdbClient getClient(ConnectionInfo connectionInfo) {
-        return getConnectionInstance(connectionInfo).getOvsdbClient();
+        OvsdbConnectionInstance connectionInstance = getConnectionInstance(connectionInfo);
+        if (connectionInstance != null) {
+            return connectionInstance.getOvsdbClient();
+        }
+        return null;
     }
 
     public OvsdbClient getClient(OvsdbBridgeAttributes mn) {