X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatabroker%2Factors%2Fdds%2FAbstractDataStoreClientActor.java;h=92071180eb7bec605b5ec7e8d8748b7da0b08be8;hb=db3d7caeeb310f76a9a159f9a8d7e9beff89f645;hp=1143bab10c39993f1d51672e6543ed94ea5a2a9a;hpb=5e7cf2452ef634dc934a3ea5a2dd95059fbab68c;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractDataStoreClientActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractDataStoreClientActor.java
index 1143bab10c..92071180eb 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractDataStoreClientActor.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractDataStoreClientActor.java
@@ -10,11 +10,11 @@ package org.opendaylight.controller.cluster.databroker.actors.dds;
 import akka.actor.ActorRef;
 import akka.util.Timeout;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
 import com.google.common.base.Verify;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nonnull;
 import org.opendaylight.controller.cluster.access.client.AbstractClientActor;
+import org.opendaylight.controller.cluster.access.client.ClientActorConfig;
 import org.opendaylight.controller.cluster.access.client.ClientActorContext;
 import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier;
 import org.opendaylight.controller.cluster.common.actor.ExplicitAsk;
@@ -33,11 +33,17 @@ public abstract class AbstractDataStoreClientActor extends AbstractClientActor {
         this.actorContext = Preconditions.checkNotNull(actorContext);
     }
 
+    @Override
+    protected ClientActorConfig getClientActorConfig() {
+        return actorContext.getDatastoreContext();
+    }
+
     @Override
     protected final AbstractDataStoreClientBehavior initialBehavior(final ClientActorContext context) {
         return Verify.verifyNotNull(initialBehavior(context, actorContext));
     }
 
+    @SuppressWarnings("checkstyle:hiddenField")
     abstract AbstractDataStoreClientBehavior initialBehavior(ClientActorContext context, ActorContext actorContext);
 
     @SuppressWarnings("checkstyle:IllegalCatch")
@@ -46,8 +52,10 @@ public abstract class AbstractDataStoreClientActor extends AbstractClientActor {
         try {
             return (DataStoreClient) Await.result(ExplicitAsk.ask(actor, GET_CLIENT_FACTORY,
                 Timeout.apply(timeout, unit)), Duration.Inf());
+        } catch (RuntimeException e) {
+            throw e;
         } catch (Exception e) {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
     }
 }