From 0311a6b45043fd14f741ceaf7f30c5afeeafc737 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Mon, 27 Jan 2014 12:42:58 -0800 Subject: [PATCH] Bug 380 SwitchManager.getHardwareMAC() does not handle empty string case Change-Id: Iaaaa63eeade69c0e2aac4299297c40fda3016584 Signed-off-by: Alessandro Boch --- .../controller/switchmanager/internal/SwitchManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java b/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java index 770180c04e..ca6987ad6c 100644 --- a/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java +++ b/opendaylight/switchmanager/implementation/src/main/java/org/opendaylight/controller/switchmanager/internal/SwitchManager.java @@ -1397,7 +1397,7 @@ public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa } catch (SocketException e) { log.error("Failed to acquire controller MAC: ", e); } - if (macAddress != null) { + if (macAddress != null && macAddress.length != 0) { break; } } -- 2.36.6