Support for metadata in HA

[groupbasedpolicy.git] / groupbasedpolicy / src / main / java / org / opendaylight / groupbasedpolicy / util / EndpointUtils.java

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/util/EndpointUtils.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/util/EndpointUtils.java
index 909f69599ef54cfa55ddb13798179769b6cbcecd..2aba8e7a59a18e0f03d2c60d2f9be33f885cc05f 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/util/EndpointUtils.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/util/EndpointUtils.java
@@ -16,8 +16,7 @@ import java.util.concurrent.ExecutionException;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
+import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.endpoints.address.endpoints.AddressEndpoint;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.endpoints.address.endpoints.AddressEndpointKey;
@@ -73,9 +72,11 @@ public class EndpointUtils {
         return Collections.emptyList();
     }
 
-    public static boolean isExternalEndpoint(@Nonnull DataBroker dataBroker, @Nonnull AddressEndpoint addrEp) {
-        ReadOnlyTransaction rTx = dataBroker.newReadOnlyTransaction();
+    public static boolean isExternalEndpoint(@Nonnull ReadTransaction rTx, @Nonnull AddressEndpoint addrEp) {
         List<ListenableFuture<Boolean>> results = new ArrayList<>();
+        if(addrEp.getEndpointGroup() == null) {
+            return false;
+        }
         for (EndpointGroupId epgId : addrEp.getEndpointGroup()) {
             results.add(Futures.transform(
                     rTx.read(LogicalDatastoreType.CONFIGURATION,
@@ -88,7 +89,6 @@ public class EndpointUtils {
                         }
                     }));
         }
-        rTx.close();
         try {
             List<Boolean> list = Futures.allAsList(results).get();
             return list.stream().anyMatch(Boolean::booleanValue);