You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bs...@apache.org on 2019/01/18 18:42:03 UTC
[geode] branch feature/GEODE-6292 updated: set thread's interrupt
bit and do a cancellation check
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-6292
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-6292 by this push:
new 512b0f3 set thread's interrupt bit and do a cancellation check
512b0f3 is described below
commit 512b0f341ad9b60b4410dd687f361aa9ed5cfc13
Author: Bruce Schuchardt <bs...@pivotal.io>
AuthorDate: Fri Jan 18 10:41:22 2019 -0800
set thread's interrupt bit and do a cancellation check
---
.../java/org/apache/geode/distributed/LocatorDUnitTest.java | 1 -
.../distributed/internal/membership/gms/membership/GMSJoinLeave.java | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 4be3d8b..8ea0ad4 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -1678,7 +1678,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
final Properties properties =
getBasicProperties(Host.getHost(0).getHostName() + "[" + port1 + "]");
properties.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
- properties.setProperty(LOG_LEVEL, "finest");
addDSProps(properties);
if (stateFile.exists()) {
assertThat(stateFile.delete()).isTrue();
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index f2066cf..33853e4 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -1157,6 +1157,8 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ services.getCancelCriterion().checkCancelInProgress(e);
throw new SystemConnectException("Interrupted while trying to contact locators");
}
}