From: Giovanni Meo <gmeo@cisco.com>
Date: Wed, 29 Jan 2014 05:38:31 +0000 (+0000)
Subject: Merge "Bug 380 SwitchManager.getHardwareMAC() does not handle empty string case"
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~563
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=3279791152f14435935d60e3abcb1c618ddc540f;hp=840517988719caf86e6ec86c8cef1b849b110030

Merge "Bug 380 SwitchManager.getHardwareMAC() does not handle empty string case"
---

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;
             }
         }