X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=elanmanager%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetvirt%2Felan%2Fl2gw%2Fha%2Fcommands%2FPhysicalLocatorCmd.java;h=26a8124d30d771c8ff8200eb12e57f6e47caf6d3;hb=cf1ea9172b94fc17e45391b62bf4ca24ac5c5fe0;hp=48adb503dcbfdf3802e9c18867a3601c35897660;hpb=84a7d0a360f0d5f9b588e269840a92158d1be7d2;p=netvirt.git

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 48adb503dc..26a8124d30 100644
--- 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;
 
+import java.util.ArrayList;
 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) {
-        if (node != null) {
-            return node.getTerminationPoint();
+        if (node != null && node.getTerminationPoint() != null) {
+            return new ArrayList<TerminationPoint>(node.getTerminationPoint().values());
         }
         return null;
     }