MRI version bumpup for Aluminium

[netvirt.git] / vpnmanager / api / src / main / java / org / opendaylight / netvirt / vpnmanager / api / VpnHelper.java

diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java
index 4ddc01c42e16a37401dc526701e13c6c0857af47..70b039d7930c31ff38063de285b1c10931ec89fb 100644 (file)
--- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java
+++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java
@@ -67,7 +67,7 @@ public final class VpnHelper {
         InstanceIdentifier<VpnInstances> id = InstanceIdentifier.builder(VpnInstances.class).build();
         Optional<VpnInstances> optVpnInstances = read(broker, LogicalDatastoreType.CONFIGURATION, id);
         if (optVpnInstances.isPresent() && optVpnInstances.get().getVpnInstance() != null) {
-            return optVpnInstances.get().getVpnInstance();
+            return new ArrayList<VpnInstance>(optVpnInstances.get().getVpnInstance().values());
         } else {
             return Collections.emptyList();
         }
@@ -119,7 +119,7 @@ public final class VpnHelper {
 
     @Nullable
     public static String getFirstVpnNameFromVpnInterface(final VpnInterface original) {
-        List<VpnInstanceNames> optList = original.getVpnInstanceNames();
+        List<VpnInstanceNames> optList = new ArrayList<VpnInstanceNames>(original.getVpnInstanceNames().values());
         if (optList != null && !optList.isEmpty()) {
             return optList.get(0).getVpnName();
         } else {