de-static-ify ElanUtils field in ElanServiceProvider

[netvirt.git] / vpnservice / elanmanager / elanmanager-impl / src / main / java / org / opendaylight / netvirt / elan / internal / InterfaceAddWorkerOnElan.java

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 810ceffed0738af57cbf1277e3c70b246651b9e1..884e510b7ae1fc472aef310e9276cae313c70b72 100644 (file)
--- 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(futures, elanInterface, interfaceInfo, elanInstance);
-        } catch (Exception e) {
-            logger.error("Error while processing {} for {}, error {}", key, elanInterface, e);
+        } catch (RuntimeException e) {
+            throw new ElanException("Error while processing " + key + " for " + elanInterface, e);
         }
         return futures;
     }