Startign 5.0.1-SNAPSHOT and Moving listener removal to app deactivation
Change-Id: I3a33c95a6e541cfa685c82e5f33b2fb70b193d68
diff --git a/impl/pom.xml b/impl/pom.xml
index 038540e..8c53dd0 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -20,12 +20,12 @@
<parent>
<artifactId>olt</artifactId>
<groupId>org.opencord</groupId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>olt-impl</artifactId>
- <version>5.0.0</version>
+ <version>5.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
diff --git a/impl/src/main/java/org/opencord/olt/impl/Olt.java b/impl/src/main/java/org/opencord/olt/impl/Olt.java
index c5f7806..79d30c6 100644
--- a/impl/src/main/java/org/opencord/olt/impl/Olt.java
+++ b/impl/src/main/java/org/opencord/olt/impl/Olt.java
@@ -230,6 +230,7 @@
protected void deactivate(ComponentContext context) {
cfgService.unregisterProperties(getClass(), false);
discoveredSubscriberExecutor.shutdown();
+ deviceService.removeListener(deviceListener);
flowsExecutor.shutdown();
subscriberExecutor.shutdown();
deviceListener.deactivate();
@@ -633,7 +634,6 @@
}
protected void unbindSadisService(SadisService service) {
- deviceService.removeListener(deviceListener);
deviceListener = null;
sadisService = null;
subsService = null;