Fix ClusterSingleton future type

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / lifecycle / GuardedContextImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/GuardedContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/GuardedContextImpl.java
index aae88d9ff2e1fd209b619701962f21b2475673c5..fc7cf9ef2f66efe8d8399b6581b7982dc08bee6e 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/GuardedContextImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/lifecycle/GuardedContextImpl.java
@@ -95,18 +95,18 @@ public class GuardedContextImpl implements GuardedContext {
 
     @Override
     @SuppressWarnings("checkstyle:IllegalCatch")
-    public ListenableFuture<Void> closeServiceInstance() {
-        ListenableFuture<Void> result = Futures.immediateFuture(null);
+    public ListenableFuture<?> closeServiceInstance() {
+        ListenableFuture<?> result = Futures.immediateFuture(null);
 
         if (monitor.enterIf(isStoppable)) {
             try {
                 LOG.info("Stopping {} service for node {}", this, getDeviceInfo());
                 state = STOPPING;
-                final ListenableFuture<Void> resultFuture = delegate.closeServiceInstance();
+                final ListenableFuture<?> resultFuture = delegate.closeServiceInstance();
 
-                Futures.addCallback(resultFuture, new FutureCallback<Void>() {
+                Futures.addCallback(resultFuture, new FutureCallback<Object>() {
                     @Override
-                    public void onSuccess(@Nullable final Void result) {
+                    public void onSuccess(@Nullable final Object result) {
                         state = TERMINATED;
                     }
 
@@ -161,4 +161,4 @@ public class GuardedContextImpl implements GuardedContext {
             }
         }
     }
-}
\ No newline at end of file
+}