Fix shutdown of ComponentContainer on error

2 files changed, 1 insertions, 4 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/platform/ComponentContainer.java b/sonar-plugin-api/src/main/java/org/sonar/api/platform/ComponentContainer.java
index 593e5a30b4c..aef6b5bc960 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/platform/ComponentContainer.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/platform/ComponentContainer.java
@@ -124,9 +124,7 @@ public class ComponentContainer implements BatchComponent, ServerComponent {
         throw PicoUtils.propagate(e);
       }
     } finally {
-      if (parent != null) {
-        parent.removeChild();
-      }
+      removeChild();
     }
     return this;
   }
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/platform/ComponentContainerTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/platform/ComponentContainerTest.java
index 6bf96d37def..22d386326e4 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/platform/ComponentContainerTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/platform/ComponentContainerTest.java
@@ -43,7 +43,6 @@ public class ComponentContainerTest {
   @Test
   public void shouldRegisterItself() {
     ComponentContainer container = new ComponentContainer();
-
     assertThat(container.getComponentByType(ComponentContainer.class)).isSameAs(container);
   }