Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use constructor injection for OSGiGlobalTimer
[controller.git]
/
opendaylight
/
config
/
netty-timer-config
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
config
/
yang
/
netty
/
timer
/
OSGiGlobalTimer.java
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 96130007923f6bf843a22999fe331eefbff36a14..87e941d7c8cb5e234a1e4cdb0a719e0f1476a41c 100644
(file)
--- 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;
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
@Activate
-
void activate
(final Config config) {
+
public OSGiGlobalTimer
(final Config config) {
delegate = HashedWheelTimerCloseable.newInstance(config.tickDuration(), config.ticksPerWheel());
LOG.info("Global Netty timer started");
}
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();
@Deactivate
void deactivate() {
delegate.stop();
+ delegate = null;
LOG.info("Global Netty timer stopped");
}
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();
+ }
}
}