rhtyd commented on a change in pull request #2293: CLOUDSTACK-10047: DVSwitch fixes and improvements URL: https://github.com/apache/cloudstack/pull/2293#discussion_r144197552
########## File path: server/src/com/cloud/hypervisor/HypervisorGuruBase.java ########## @@ -138,7 +143,24 @@ protected VirtualMachineTO toVirtualMachineTO(VirtualMachineProfile vmProfile) { if(vm.getType() == VirtualMachine.Type.NetScalerVm) { nicProfile.setBroadcastType(BroadcastDomainType.Native); } - nics[i++] = toNicTO(nicProfile); + NicTO nicTo = toNicTO(nicProfile); + final NetworkVO network = _networkDao.findByUuid(nicTo.getNetworkUuid()); + if (network != null) { + final Map<NetworkOffering.Detail, String> details = networkOfferingDetailsDao.getNtwkOffDetails(network.getNetworkOfferingId()); + if (details != null) { Review comment: We're protecting against NPEs and setting details to a `NicTO` object when those details are available. We cannot simply `continue` as the value is being set at lines 161, 163. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services