From 583f30d1c7a8199b401c9393745c62fe27b5ced8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 23 Mar 2017 15:46:16 +0100 Subject: [PATCH] BUG-8056: make doCommit/finishCommit package-private This is not a complete fix for the issue, but it eliminates the need for synthetic accessor methods: at org.opendaylight.controller.cluster.datastore.ShardCommitCoordinator.doCommit(ShardCommitCoordinator.java:296) at org.opendaylight.controller.cluster.datastore.ShardCommitCoordinator.access$200(ShardCommitCoordinator.java:49) at org.opendaylight.controller.cluster.datastore.ShardCommitCoordinator$2.onSuccess(ShardCommitCoordinator.java:243) at org.opendaylight.controller.cluster.datastore.ShardCommitCoordinator.finishCommit(ShardCommitCoordinator.java:316) at org.opendaylight.controller.cluster.datastore.ShardCommitCoordinator.access$400(ShardCommitCoordinator.java:49) at org.opendaylight.controller.cluster.datastore.ShardCommitCoordinator$3.onSuccess(ShardCommitCoordinator.java:299) Leading to a leaner stack. Change-Id: I825da37f91749016a4d4e64e7bfb75f03f9b450b Signed-off-by: Robert Varga --- .../controller/cluster/datastore/ShardCommitCoordinator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinator.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinator.java index 33634b1d6c..691a4da66c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinator.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinator.java @@ -285,7 +285,7 @@ final class ShardCommitCoordinator { handleCanCommit(cohortEntry); } - private void doCommit(final CohortEntry cohortEntry) { + void doCommit(final CohortEntry cohortEntry) { log.debug("{}: Committing transaction {}", name, cohortEntry.getTransactionId()); // We perform the preCommit phase here atomically with the commit phase. This is an @@ -309,7 +309,7 @@ final class ShardCommitCoordinator { }); } - private void finishCommit(@Nonnull final ActorRef sender, @Nonnull final CohortEntry cohortEntry) { + void finishCommit(@Nonnull final ActorRef sender, @Nonnull final CohortEntry cohortEntry) { log.debug("{}: Finishing commit for transaction {}", persistenceId(), cohortEntry.getTransactionId()); cohortEntry.commit(new FutureCallback() { -- 2.36.6