From 91fb8d5b337b707717785aa4e988c7a5d5ead2a7 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 21 Sep 2017 11:00:24 +0200
Subject: [PATCH] Fix use of deprecated Futures.addCallback()

Specify MoreExecutors.directExecutor() instead of relying on a deprecated
method.

Change-Id: I097672d7624f5d32957fac3b18b8205c929c5729
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../dom/impl/AbstractClusterSingletonServiceProviderImpl.java  | 2 +-
 .../singleton/dom/impl/ClusterSingletonServiceGroupImpl.java   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractClusterSingletonServiceProviderImpl.java b/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractClusterSingletonServiceProviderImpl.java
index 0ecf7e01d6..0f1d583cbe 100644
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractClusterSingletonServiceProviderImpl.java
+++ b/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/AbstractClusterSingletonServiceProviderImpl.java
@@ -222,7 +222,7 @@ public abstract class AbstractClusterSingletonServiceProviderImpl<P extends Path
                     AbstractClusterSingletonServiceProviderImpl.this, throwable);
                 cleanup();
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     @Override
diff --git a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImpl.java b/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImpl.java
index 82897e6c60..279129adc0 100644
--- a/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImpl.java
+++ b/singleton-service/mdsal-singleton-dom-impl/src/main/java/org/opendaylight/mdsal/singleton/dom/impl/ClusterSingletonServiceGroupImpl.java
@@ -15,6 +15,7 @@ import com.google.common.base.Verify;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.ArrayList;
 import java.util.List;
@@ -533,7 +534,7 @@ final class ClusterSingletonServiceGroupImpl<P extends Path<P>, E extends Generi
             public void onSuccess(final List<Void> nulls) {
                 onServicesStopped();
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     void onServicesStopped() {
-- 
2.36.6