From b42f3f53d8f1b1c1b8c9d151cc9b93d44a255afa Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Wed, 7 Nov 2012 10:02:30 -0700 Subject: [PATCH] Summary: Fix empty traffic labels causing NullPointerExceptions on KVM Detail: In com.cloud.hypervisor.kvm.resource.BridgeVifDriver.java, in 2 places an if block should have evaluated to true if trafficLabel was null, however it was causing a NullPointerException instead. BUG-ID : NONE Bugfix-for: 4.0 Reviewed-by: Marcus Sorensen Reported-by: Dave Cahill Signed-off-by: Marcus Sorensen 1352307750 -0700 --- .../com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java index 116c09d3807..e6f2f7f376a 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java @@ -89,7 +89,7 @@ public class BridgeVifDriver extends VifDriverBase { if (nic.getType() == Networks.TrafficType.Guest) { if (nic.getBroadcastType() == Networks.BroadcastDomainType.Vlan && !vlanId.equalsIgnoreCase("untagged")) { - if(trafficLabel != null || !trafficLabel.isEmpty()) { + if(trafficLabel != null && !trafficLabel.isEmpty()) { s_logger.debug("creating a vlan dev and bridge for guest traffic per traffic label " + trafficLabel); String brName = createVlanBr(vlanId, _pifs.get(trafficLabel)); intf.defBridgeNet(brName, null, nic.getMac(), getGuestNicModel(guestOsType)); @@ -107,7 +107,7 @@ public class BridgeVifDriver extends VifDriverBase { } else if (nic.getType() == Networks.TrafficType.Public) { if (nic.getBroadcastType() == Networks.BroadcastDomainType.Vlan && !vlanId.equalsIgnoreCase("untagged")) { - if(trafficLabel != null || !trafficLabel.isEmpty()){ + if(trafficLabel != null && !trafficLabel.isEmpty()){ s_logger.debug("creating a vlan dev and bridge for public traffic per traffic label " + trafficLabel); String brName = createVlanBr(vlanId, _pifs.get(trafficLabel)); intf.defBridgeNet(brName, null, nic.getMac(), getGuestNicModel(guestOsType));