BUG-8494: propagate submit failure immediately

[controller.git] / opendaylight / config / config-persister-feature4-adapter / src / main / java / org / opendaylight / controller / configpusherfeature / internal / FeatureConfigPusher.java

diff --git a/opendaylight/config/config-persister-feature4-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java b/opendaylight/config/config-persister-feature4-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java
index ed1b6203812c537da4868c3420e45832d4144abd..5d487e0b9cd8ff6aa427450679291135e320f65c 100644 (file)
--- a/opendaylight/config/config-persister-feature4-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java
+++ b/opendaylight/config/config-persister-feature4-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java
@@ -82,6 +82,11 @@ public class FeatureConfigPusher {
             LOG.debug("Ignoring conditional feature {}", feature);
             return Collections.emptySet();
         }
+        // pax-exam's Karaf container generates a wrapper feature holding the test dependencies. Ignore it.
+        if ("test-dependencies".equals(feature.getName())) {
+            LOG.debug("Ignoring pax-exam wrapper feature {}", feature);
+            return Collections.emptySet();
+        }
 
         if (!isInstalled(feature)) {
             return Collections.emptySet();
@@ -113,7 +118,7 @@ public class FeatureConfigPusher {
 
                 LOG.info("Karaf Feature Service has not yet finished installing feature {}/{} (retry {})",
                     feature.getName(), feature.getVersion(), retries);
-            } catch (Exception e) {
+            } catch (final Exception e) {
                 LOG.warn("Karaf featuresService.listInstalledFeatures() has thrown an exception, retry {}", retries, e);
             }