You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2021/01/12 17:56:09 UTC
[geode] branch develop updated: GEODE-8696: Remove redundant syncs
to prevent deadlock (#5894)
This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 0e3ade5 GEODE-8696: Remove redundant syncs to prevent deadlock (#5894)
0e3ade5 is described below
commit 0e3ade53f724990a0932151a6fb6e90fe510758f
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Tue Jan 12 09:55:05 2021 -0800
GEODE-8696: Remove redundant syncs to prevent deadlock (#5894)
FederatingManager now uses a ReentrantLock instead of synchronization.
---
.../org/apache/geode/management/internal/FederatingManager.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java b/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java
index 3ba7c21..afc51d4 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java
@@ -112,7 +112,7 @@ public class FederatingManager extends Manager implements ManagerMembership {
* Management exception has to be handled by the caller.
*/
@Override
- public synchronized void startManager() {
+ public void startManager() {
try {
lifecycleLock.lock();
try {
@@ -162,7 +162,7 @@ public class FederatingManager extends Manager implements ManagerMembership {
}
@Override
- public synchronized void stopManager() {
+ public void stopManager() {
lifecycleLock.lock();
try {
// remove hidden management regions and federatedMBeans
@@ -352,7 +352,7 @@ public class FederatingManager extends Manager implements ManagerMembership {
}
}
- private synchronized void executeTask(Runnable task) {
+ private void executeTask(Runnable task) {
try {
executorService.get().execute(task);
} catch (RejectedExecutionException ignored) {