Code Review
/
netvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
MRI version bumpup for Aluminium
[netvirt.git]
/
elanmanager
/
impl
/
src
/
main
/
java
/
org
/
opendaylight
/
netvirt
/
elan
/
l2gw
/
ha
/
commands
/
PhysicalLocatorCmd.java
diff --git
a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java
b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java
index 48adb503dcbfdf3802e9c18867a3601c35897660..26a8124d30d771c8ff8200eb12e57f6e47caf6d3 100644
(file)
--- a/
elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java
+++ b/
elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/PhysicalLocatorCmd.java
@@
-7,6
+7,7
@@
*/
package org.opendaylight.netvirt.elan.l2gw.ha.commands;
*/
package org.opendaylight.netvirt.elan.l2gw.ha.commands;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import org.eclipse.jdt.annotation.Nullable;
import java.util.List;
import java.util.Objects;
import org.eclipse.jdt.annotation.Nullable;
@@
-25,8
+26,8
@@
public class PhysicalLocatorCmd extends MergeCommand<TerminationPoint, NodeBuild
@Override
@Nullable
public List<TerminationPoint> getData(Node node) {
@Override
@Nullable
public List<TerminationPoint> getData(Node node) {
- if (node != null) {
- return n
ode.getTerminationPoint(
);
+ if (node != null
&& node.getTerminationPoint() != null
) {
+ return n
ew ArrayList<TerminationPoint>(node.getTerminationPoint().values()
);
}
return null;
}
}
return null;
}