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/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java
index 0de64ca..b623b5d 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java
@@ -137,6 +137,10 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected MastershipService mastershipService;
 
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected MastershipTermService termService;
+
+
     protected static final KryoSerializer SERIALIZER = new KryoSerializer() {
         @Override
         protected void setupKryoPool() {
@@ -736,7 +740,6 @@
             }
             log.debug("Temporarily requesting role for {} to remove", deviceId);
             mastershipService.requestRoleFor(deviceId);
-            MastershipTermService termService = mastershipService.requestTermService();
             MastershipTerm term = termService.getMastershipTerm(deviceId);
             if (myId.equals(term.master())) {
                 master = myId;