scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-24 05:44:54 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

fixed NPE in OvsdbDao.updateVifConfigsSetForRadio

Browse Source
This commit is contained in:
Dmitry Toptygin
2020-06-25 12:24:25 -04:00
parent bbed379675
commit 7af93a052d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
View File

@@ -1983,18 +1983,22 @@ public class OvsdbDao {
fResult = ovsdbClient.transact(ovsdbName, operations); fResult = ovsdbClient.transact(ovsdbName, operations);
result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS); result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
Set<Uuid> vifConfigsSet = null; Set<Uuid> vifConfigsSet = new HashSet<Uuid>();
if (result != null && result.length > 0 && !((SelectResult) result[0]).getRows().isEmpty()) { if (result != null && result.length > 0 && !((SelectResult) result[0]).getRows().isEmpty()) {
row = ((SelectResult) result[0]).getRows().iterator().next(); row = ((SelectResult) result[0]).getRows().iterator().next();
if (row != null) { if (row != null) {
vifConfigsSet = row.getSetColumn("vif_configs"); vifConfigsSet = row.getSetColumn("vif_configs");
} else { if(vifConfigsSet == null) {
vifConfigsSet = new HashSet<Uuid>(); vifConfigsSet = new HashSet<Uuid>();
} }
} }
}
if(vifConfigUuid!=null) {
vifConfigsSet.add(vifConfigUuid); vifConfigsSet.add(vifConfigUuid);
}
com.vmware.ovsdb.protocol.operation.notation.Set vifConfigs = com.vmware.ovsdb.protocol.operation.notation.Set com.vmware.ovsdb.protocol.operation.notation.Set vifConfigs = com.vmware.ovsdb.protocol.operation.notation.Set
.of(vifConfigsSet); .of(vifConfigsSet);