Optional clean-up

[netvirt.git] / vpnservice / cloud-servicechain / cloud-servicechain-impl / src / main / java / org / opendaylight / netvirt / cloudservicechain / ElanServiceChainHandler.java

diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java
index e73e93a47421c0bcb41fca31ec9d8ddc09a9e011..148e67512203dd6e9b3fffd521f449dffd8d915e 100755 (executable)
--- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java
+++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/ElanServiceChainHandler.java
@@ -79,8 +79,8 @@ public class ElanServiceChainHandler {
             return;
         }
 
-        Optional<Collection<BigInteger>> elanDpnsOpc = ElanServiceChainUtils.getElanDpnsByName(broker, elanName);
-        if ( !elanDpnsOpc.isPresent() ) {
+        Collection<BigInteger> elanDpnsOpc = ElanServiceChainUtils.getElanDpnsByName(broker, elanName);
+        if (elanDpnsOpc.isEmpty()) {
             LOG.debug("Could not find any DPN related to Elan {}", elanName);
             return;
         }
@@ -100,7 +100,7 @@ public class ElanServiceChainHandler {
         //    Program LPortDispatcher to Scf
         //    Program LPortDispatcher from Scf
         //    Program ExtTunnelTable.
-        for (BigInteger dpnId : elanDpnsOpc.get()) {
+        for (BigInteger dpnId : elanDpnsOpc) {
             ElanServiceChainUtils.programLPortDispatcherToScf(mdsalManager, dpnId, elanTag, elanLportTag, tableId,
                                                               scfTag, addOrRemove);
             ElanServiceChainUtils.programLPortDispatcherFromScf(mdsalManager, dpnId, elanLportTag, elanTag,