X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fnetty-timer-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyang%2Fnetty%2Ftimer%2FOSGiGlobalTimer.java;fp=opendaylight%2Fconfig%2Fnetty-timer-config%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyang%2Fnetty%2Ftimer%2FOSGiGlobalTimer.java;h=87e941d7c8cb5e234a1e4cdb0a719e0f1476a41c;hp=96130007923f6bf843a22999fe331eefbff36a14;hb=0537bf92359cfd487e59c23f6baad79ee831502e;hpb=e7a21881a7db61fb7c386b48075a120f0ffb6c08

diff --git a/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/OSGiGlobalTimer.java b/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/OSGiGlobalTimer.java
index 9613000792..87e941d7c8 100644
--- a/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/OSGiGlobalTimer.java
+++ b/opendaylight/config/netty-timer-config/src/main/java/org/opendaylight/controller/config/yang/netty/timer/OSGiGlobalTimer.java
@@ -36,18 +36,8 @@ public final class OSGiGlobalTimer implements Timer {
 
     private Timer delegate;
 
-    @Override
-    public Timeout newTimeout(final TimerTask task, final long delay, final TimeUnit unit) {
-        return delegate.newTimeout(task, delay, unit);
-    }
-
-    @Override
-    public Set<Timeout> stop() {
-        return delegate.stop();
-    }
-
     @Activate
-    void activate(final Config config) {
+    public OSGiGlobalTimer(final Config config) {
         delegate = HashedWheelTimerCloseable.newInstance(config.tickDuration(), config.ticksPerWheel());
         LOG.info("Global Netty timer started");
     }
@@ -55,6 +45,17 @@ public final class OSGiGlobalTimer implements Timer {
     @Deactivate
     void deactivate() {
         delegate.stop();
+        delegate = null;
         LOG.info("Global Netty timer stopped");
     }
+
+    @Override
+    public Timeout newTimeout(final TimerTask task, final long delay, final TimeUnit unit) {
+        return delegate.newTimeout(task, delay, unit);
+    }
+
+    @Override
+    public Set<Timeout> stop() {
+        return delegate.stop();
+    }
 }