commit bcac4995dff2b9afa709dc6333a1ca2c13f1f75d
author Yuta HIGUCHI <y-higuchi@onlab.us> Sat Nov 22 19:27:57 2014 -0800
committer Yuta Higuchi <y-higuchi@onlab.us> Sun Nov 23 16:17:07 2014 -0800
tree 7c1e669b642e6d949e1b3d5df420f847917e7243
parent 427a1760d4d3216682ccd9457702055dcf3b6379

Flatten MastershipTermService

Change-Id: Ic75b7376f7436c76f69127d6137577ec2fc09d2b

core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java

diff --git a/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
index f45d4de..95723b3 100644
--- a/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
@@ -100,6 +100,7 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected MastershipService mastershipService;
 
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected MastershipTermService termService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -112,7 +113,6 @@
         store.setDelegate(delegate);
         eventDispatcher.addSink(DeviceEvent.class, listenerRegistry);
         mastershipService.addListener(mastershipListener);
-        termService = mastershipService.requestTermService();
 
         backgroundService.scheduleWithFixedDelay(new Runnable() {