X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fosgi%2FExtensibleBundleTracker.java;h=31bd5fa25ee7f3652098bc1c1f840bf384c411e1;hb=aebe2884329d666f661be53e2de3a57e4fcf61f1;hp=eff267ad1319c90c1ce9e06de2ff7bcaddc86c67;hpb=92a9bca9109fef4ef261f5c711baa48f5d05bca2;p=controller.git

diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ExtensibleBundleTracker.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ExtensibleBundleTracker.java
index eff267ad13..31bd5fa25e 100644
--- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ExtensibleBundleTracker.java
+++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ExtensibleBundleTracker.java
@@ -9,7 +9,6 @@ package org.opendaylight.controller.config.manager.impl.osgi;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -49,10 +48,8 @@ import org.slf4j.LoggerFactory;
  * @param <T>
  */
 public final class ExtensibleBundleTracker<T> extends BundleTracker<Future<T>> {
-
     private static final ThreadFactory THREAD_FACTORY = new ThreadFactoryBuilder()
-        .setNameFormat("config-bundle-tracker-%d")
-        .build();
+        .setNameFormat("config-bundle-tracker-%d").build();
     private final ExecutorService eventExecutor;
     private final BundleTrackerCustomizer<T> primaryTracker;
     private final BundleTrackerCustomizer<?>[] additionalTrackers;
@@ -60,13 +57,13 @@ public final class ExtensibleBundleTracker<T> extends BundleTracker<Future<T>> {
     private static final Logger LOG = LoggerFactory.getLogger(ExtensibleBundleTracker.class);
 
     public ExtensibleBundleTracker(final BundleContext context, final BundleTrackerCustomizer<T> primaryBundleTrackerCustomizer,
-                                   final BundleTrackerCustomizer<?>... additionalBundleTrackerCustomizers) {
+            final BundleTrackerCustomizer<?>... additionalBundleTrackerCustomizers) {
         this(context, Bundle.ACTIVE, primaryBundleTrackerCustomizer, additionalBundleTrackerCustomizers);
     }
 
     public ExtensibleBundleTracker(final BundleContext context, final int bundleState,
-                                   final BundleTrackerCustomizer<T> primaryBundleTrackerCustomizer,
-                                   final BundleTrackerCustomizer<?>... additionalBundleTrackerCustomizers) {
+            final BundleTrackerCustomizer<T> primaryBundleTrackerCustomizer,
+            final BundleTrackerCustomizer<?>... additionalBundleTrackerCustomizers) {
         super(context, bundleState, null);
         this.primaryTracker = primaryBundleTrackerCustomizer;
         this.additionalTrackers = additionalBundleTrackerCustomizers;
@@ -92,7 +89,7 @@ public final class ExtensibleBundleTracker<T> extends BundleTracker<Future<T>> {
                     LOG.trace("AddingBundle for {} and event {} finished successfully",bundle,event);
                     return primaryTrackerRetVal;
                 } catch (Exception e) {
-                    LOG.error("Failed to add bundle {}",e);
+                    LOG.error("Failed to add bundle {}", bundle, e);
                     throw e;
                 }
             }
@@ -124,8 +121,8 @@ public final class ExtensibleBundleTracker<T> extends BundleTracker<Future<T>> {
                 }
             });
             LOG.trace("Removed bundle event for {} finished successfully.",bundle);
-        } catch (InterruptedException | ExecutionException e) {
-            LOG.error("Addition of bundle failed, ", e);
+        } catch (Exception e) {
+            LOG.error("Failed to remove bundle {}", bundle, e);
         }
     }