From: Giovanni Meo <gmeo@cisco.com>
Date: Wed, 24 Jul 2013 11:04:46 +0000 (+0200)
Subject: Fix a wrong notification in ComponentActivatorAbstractBase
X-Git-Tag: releasepom-0.1.0~263
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=49c45cc5dc8676ccc8c769047fe74642dc1537b7

Fix a wrong notification in ComponentActivatorAbstractBase

The ComponentActivatorAbstractBase is currently looking for the
"stopping" method on the component that is stopping, during the
"stopped" phase provided by Apache Dependency Manager, while that
should be raised during the "stopping" phase. Correcting the
mis-alignment.

Change-Id: I1ff703ce071e2f5c80215b748b4f046760445b21
Signed-off-by: Giovanni Meo <gmeo@cisco.com>
---

diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ComponentActivatorAbstractBase.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ComponentActivatorAbstractBase.java
index 66882af5d3..de77837c34 100644
--- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ComponentActivatorAbstractBase.java
+++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/ComponentActivatorAbstractBase.java
@@ -152,6 +152,11 @@ abstract public class ComponentActivatorAbstractBase implements
 
         @Override
         public void stopped(Component component) {
+            // do nothing
+        }
+
+        @Override
+        public void stopping(Component component) {
             if (component == null) {
                 return;
             }
@@ -160,11 +165,6 @@ abstract public class ComponentActivatorAbstractBase implements
                     { Component.class }, {} }, new Object[][] { { component },
                     {} });
         }
-
-        @Override
-        public void stopping(Component component) {
-            // do nothing
-        }
     }
 
     /**