commit ebe203d876f2ec08384bd03ff4f5fed8b7100730
author Satish K <satishk@huawei.com> Sat Nov 21 15:58:18 2015 +0530
committer Gerrit Code Review <gerrit@onlab.us> Tue Dec 01 01:31:45 2015 +0000
tree 8e0f4a0035a45342a3998f2ab43c0c6ebaefc02a
parent e276682e414260117cd43c90730f2f61746b8944

bridgeUuid not null check further lead to Null access in fall through function call - Fix

Change-Id: I184491d5b4550e6c21f7649e0168c9308a7e16a0

ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java

diff --git a/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java b/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
index c603863..8a661ab 100644
--- a/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
+++ b/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/driver/DefaultOvsdbClient.java
@@ -43,6 +43,7 @@
 import org.onosproject.ovsdb.controller.OvsdbStore;
 import org.onosproject.ovsdb.controller.OvsdbTableStore;
 import org.onosproject.ovsdb.controller.OvsdbTunnel;
+import org.onosproject.ovsdb.rfc.exception.BridgeCreateException;
 import org.onosproject.ovsdb.rfc.jsonrpc.Callback;
 import org.onosproject.ovsdb.rfc.message.OperationResult;
 import org.onosproject.ovsdb.rfc.message.TableUpdates;
@@ -479,6 +480,9 @@
                     insertConfig(OvsdbConstant.PORT, "_uuid", "Bridge", "ports", bridgeUuid,
                                  port.getRow());
                 }
+            } else {
+                String message = BridgeCreateException.createMessage(ovsUuid);
+                throw new BridgeCreateException(message);
             }
 
         } else {
@@ -545,6 +549,9 @@
                     insertConfig(OvsdbConstant.PORT, "_uuid", "Bridge", "ports", bridgeUuid,
                                  port.getRow());
                 }
+            } else {
+                String message = BridgeCreateException.createMessage(ovsUuid);
+                throw new BridgeCreateException(message);
             }
 
         } else {