Add MXBean to report shard registered DTCL/DCL info

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / CompositeDataTreeCohort.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java
index 338ae645345bc8b4e3237965260e67590ad811da..c4afcfd4d803cf275894d270c9d2574681558bfe 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java
@@ -224,7 +224,7 @@ class CompositeDataTreeCohort {
 
         final Iterable<Object> results;
         try {
-            results = Await.result(Futures.sequence(Lists.transform(futures, e -> e.getValue()),
+            results = Await.result(Futures.sequence(Lists.transform(futures, Entry::getValue),
                 ExecutionContexts.global()), timeout.duration());
         } catch (TimeoutException e) {
             successfulFromPrevious = null;
@@ -268,8 +268,8 @@ class CompositeDataTreeCohort {
             while (it.hasNext()) {
                 firstEx.addSuppressed(it.next().cause());
             }
-            Throwables.propagateIfInstanceOf(firstEx, ExecutionException.class);
-            Throwables.propagateIfInstanceOf(firstEx, TimeoutException.class);
+            Throwables.throwIfInstanceOf(firstEx, ExecutionException.class);
+            Throwables.throwIfInstanceOf(firstEx, TimeoutException.class);
             throw new ExecutionException(firstEx);
         }
         changeStateFrom(currentState, afterState);