Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix For Bug #335 Bug Description : Remove SW2 property "description" to a...
[controller.git]
/
opendaylight
/
switchmanager
/
implementation
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
switchmanager
/
internal
/
SwitchManager.java
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 e8104b5647f430d238b758b0ad283a42fc2f5b31..19f45e63c591dbde396e0929141c5c042a55adf5 100644
(file)
--- 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
@@
-1402,7
+1402,7
@@
public class SwitchManager implements ISwitchManager, IConfigurationContainerAwa
} catch (SocketException e) {
log.error("Failed to acquire controller MAC: ", e);
}
} catch (SocketException e) {
log.error("Failed to acquire controller MAC: ", e);
}
- if (macAddress != null) {
+ if (macAddress != null
&& macAddress.length != 0
) {
break;
}
}
break;
}
}