X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=vpnservice%2Felanmanager%2Felanmanager-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetvirt%2Felan%2Finternal%2FInterfaceAddWorkerOnElan.java;h=884e510b7ae1fc472aef310e9276cae313c70b72;hb=a5680413291099aa2eb41af1b5e2c81c9eaa1484;hp=a62c5feeae5f8014957126a778707446cc2de906;hpb=d0e8a64bbe86935a6f4dcd78b3e4274914bce65a;p=netvirt.git

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java
index a62c5feeae..884e510b7a 100644
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/InterfaceAddWorkerOnElan.java
@@ -7,25 +7,26 @@
  */
 package org.opendaylight.netvirt.elan.internal;
 
+import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
-
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
+import org.opendaylight.netvirt.elan.ElanException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.ElanInterface;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.util.concurrent.ListenableFuture;
-
 public class InterfaceAddWorkerOnElan implements Callable<List<ListenableFuture<Void>>> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(InterfaceAddWorkerOnElan.class);
+
     private String key;
     private ElanInterface elanInterface;
     private ElanInstance elanInstance;
     private InterfaceInfo interfaceInfo;
     private ElanInterfaceManager dataChangeListener;
-    private static final Logger logger = LoggerFactory.getLogger(InterfaceAddWorkerOnElan.class);
 
     public InterfaceAddWorkerOnElan(String key, ElanInterface elanInterface, InterfaceInfo interfaceInfo,
                                     ElanInstance elanInstance, ElanInterfaceManager dataChangeListener) {
@@ -45,12 +46,13 @@ public class InterfaceAddWorkerOnElan implements Callable<List<ListenableFuture<
 
 
     @Override
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public List<ListenableFuture<Void>> call() throws Exception {
         List<ListenableFuture<Void>> futures = new ArrayList<>();
         try {
-            dataChangeListener.addElanInterface(elanInterface, interfaceInfo, elanInstance);
-        } catch (Exception e) {
-            logger.error("Error while processing {} for {}, error {}", key, elanInterface, e);
+            dataChangeListener.addElanInterface(futures, elanInterface, interfaceInfo, elanInstance);
+        } catch (RuntimeException e) {
+            throw new ElanException("Error while processing " + key + " for " + elanInterface, e);
         }
         return futures;
     }