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 2016/07/12 23:43:47 UTC
incubator-geode git commit: GEODE-1642 Add conveniance method
isCancelInProgress to CancelCriterion
Repository: incubator-geode
Updated Branches:
refs/heads/develop 2a728eee9 -> 435283357
GEODE-1642 Add conveniance method isCancelInProgress to CancelCriterion
This adds a new method, isCancelInProgress(), to CancelCriterion. Most
uses of the method cancelInProgress() have now been changed to use the
new method.
This also includes a fix for GEODE-1596, an IndexOutOfBoundsException
suspect string in JGroups.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/43528335
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/43528335
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/43528335
Branch: refs/heads/develop
Commit: 435283357a59dcfe25fad9126e7b5a6433fd20d1
Parents: 2a728ee
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Tue Jul 12 16:40:43 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Tue Jul 12 16:43:25 2016 -0700
----------------------------------------------------------------------
.../com/gemstone/gemfire/CancelCriterion.java | 13 +++++++++++++
.../client/internal/AutoConnectionSourceImpl.java | 2 +-
.../internal/DataSerializerRecoveryListener.java | 10 +++++-----
.../client/internal/EndpointManagerImpl.java | 6 +++---
.../internal/InstantiatorRecoveryListener.java | 2 +-
.../cache/client/internal/LiveServerPinger.java | 2 +-
.../cache/client/internal/QueueStateImpl.java | 2 +-
.../client/internal/RegisterInterestTracker.java | 2 +-
.../internal/pooling/ConnectionManagerImpl.java | 4 ++--
.../cache/query/internal/index/IndexManager.java | 2 +-
.../distributed/internal/DistributionManager.java | 4 ++--
.../internal/InternalDistributedSystem.java | 4 ++--
.../internal/direct/DirectChannel.java | 2 +-
.../distributed/internal/locks/DLockGrantor.java | 4 ++--
.../distributed/internal/locks/DLockService.java | 8 ++++----
.../internal/membership/gms/Services.java | 4 ----
.../membership/gms/membership/GMSJoinLeave.java | 4 ++--
.../membership/gms/messenger/Transport.java | 4 +++-
.../membership/gms/mgr/GMSMembershipManager.java | 8 ++++----
.../gemfire/internal/HostStatSampler.java | 2 +-
.../gemfire/internal/admin/StatAlertsManager.java | 2 +-
.../internal/admin/remote/FetchHostResponse.java | 2 +-
.../gemfire/internal/cache/BucketAdvisor.java | 2 +-
.../gemfire/internal/cache/BucketRegion.java | 2 +-
.../gemfire/internal/cache/DiskStoreImpl.java | 2 +-
...DistributedRegionFunctionStreamingMessage.java | 2 +-
.../cache/MemberFunctionStreamingMessage.java | 2 +-
.../internal/cache/PRHARedundancyProvider.java | 4 ++--
.../gemfire/internal/cache/PartitionedRegion.java | 2 +-
.../internal/cache/PartitionedRegionHelper.java | 4 ++--
.../internal/cache/TXSynchronizationRunnable.java | 2 +-
.../gemfire/internal/cache/TombstoneService.java | 2 +-
.../gemfire/internal/cache/ha/HARegionQueue.java | 2 +-
.../internal/cache/locks/TXLockServiceImpl.java | 2 +-
.../cache/partitioned/RecoveryRunnable.java | 2 +-
.../internal/cache/partitioned/RegionAdvisor.java | 2 +-
.../internal/cache/tier/CachedRegionHelper.java | 2 +-
.../internal/cache/tier/sockets/AcceptorImpl.java | 4 ++--
.../cache/tier/sockets/CacheClientProxy.java | 2 +-
.../cache/tier/sockets/CacheClientUpdater.java | 4 ++--
.../cache/tier/sockets/ServerConnection.java | 2 +-
.../sockets/command/GatewayReceiverCommand.java | 2 +-
.../wan/AbstractGatewaySenderEventProcessor.java | 2 +-
.../internal/cache/wan/GatewaySenderAdvisor.java | 3 +--
.../wan/parallel/ParallelGatewaySenderQueue.java | 2 +-
.../wan/serial/SerialGatewaySenderQueue.java | 2 +-
.../internal/statistics/CallbackSampler.java | 2 +-
.../gemstone/gemfire/internal/tcp/Connection.java | 18 +++++++++---------
.../gemstone/gemfire/internal/tcp/TCPConduit.java | 4 ++--
.../internal/AutoConnectionSourceDUnitTest.java | 10 +++++-----
.../gms/mgr/GMSMembershipManagerJUnitTest.java | 2 +-
.../internal/cache/SystemFailureDUnitTest.java | 4 ++--
.../statistics/CallbackSamplerJUnitTest.java | 2 +-
.../dunit/cache/internal/JUnit4CacheTestCase.java | 4 ++--
.../cache/query/internal/cq/CqServiceImpl.java | 6 +++---
.../wan/GatewaySenderEventRemoteDispatcher.java | 2 +-
56 files changed, 107 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/CancelCriterion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/CancelCriterion.java b/geode-core/src/main/java/com/gemstone/gemfire/CancelCriterion.java
index 03fadb0..0cb44ca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/CancelCriterion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/CancelCriterion.java
@@ -45,6 +45,7 @@ package com.gemstone.gemfire;
*/
public abstract class CancelCriterion
{
+
/**
* Indicate if the service is in the progress of being cancelled. The
* typical use of this is to indicate, in the case of an {@link InterruptedException},
@@ -105,4 +106,16 @@ public abstract class CancelCriterion
* the receiver has not been cancelled.
*/
abstract public RuntimeException generateCancelledException(Throwable e);
+
+ /**
+ * Checks to see if a cancellation is in progress. This is equivalent to
+ * the expression (cancelInProgress() != null).
+ *
+ * @return true if a cancellation is in progress, false if not
+ */
+ public boolean isCancelInProgress() {
+ return cancelInProgress() != null;
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java
index 985b4c3..db34c9f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImpl.java
@@ -370,7 +370,7 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
protected class UpdateLocatorListTask extends PoolTask {
@Override
public void run2() {
- if(pool.getCancelCriterion().cancelInProgress() != null) {
+ if(pool.getCancelCriterion().isCancelInProgress()) {
return;
}
LocatorListResponse response = (LocatorListResponse) queryLocators(LOCATOR_LIST_REQUEST);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DataSerializerRecoveryListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DataSerializerRecoveryListener.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DataSerializerRecoveryListener.java
index ef471c8..4333b0e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DataSerializerRecoveryListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/DataSerializerRecoveryListener.java
@@ -89,7 +89,7 @@ public class DataSerializerRecoveryListener extends EndpointManager.EndpointList
@Override
public void run2() {
- if (pool.getCancelCriterion().cancelInProgress() != null) {
+ if (pool.getCancelCriterion().isCancelInProgress()) {
return;
}
@@ -111,7 +111,7 @@ public class DataSerializerRecoveryListener extends EndpointManager.EndpointList
TimeUnit.MILLISECONDS);
recoveryScheduled = true;
} catch (RejectedExecutionException e) {
- if (pool.getCancelCriterion().cancelInProgress() == null) {
+ if (!pool.getCancelCriterion().isCancelInProgress()) {
throw e;
}
}
@@ -125,12 +125,12 @@ public class DataSerializerRecoveryListener extends EndpointManager.EndpointList
}
catch (RejectedExecutionException e) {
// This is probably because we've started to shut down.
- if (pool.getCancelCriterion().cancelInProgress() == null) {
+ if (!pool.getCancelCriterion().isCancelInProgress()) {
throw e; // weird
}
}
catch(Exception e) {
- if (pool.getCancelCriterion().cancelInProgress() != null) {
+ if (pool.getCancelCriterion().isCancelInProgress()) {
return;
}
@@ -153,7 +153,7 @@ public class DataSerializerRecoveryListener extends EndpointManager.EndpointList
recoveryScheduled = true;
} catch (RejectedExecutionException ex) { // GEODE-1613 - suspect string while shutting down
if (!background.isTerminated()
- && pool.getCancelCriterion().cancelInProgress() == null) {
+ && !pool.getCancelCriterion().isCancelInProgress()) {
throw ex;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/EndpointManagerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/EndpointManagerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/EndpointManagerImpl.java
index 8b4e08a..d155602 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/EndpointManagerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/EndpointManagerImpl.java
@@ -276,7 +276,7 @@ public class EndpointManagerImpl implements EndpointManager {
public class EndpointListenerForBridgeMembership implements EndpointManager.EndpointListener {
public void endpointCrashed(Endpoint endpoint) {
- if(endpoint.getMemberId()==null || cancelCriterion.cancelInProgress()!=null) {
+ if(endpoint.getMemberId()==null || cancelCriterion.isCancelInProgress()) {
return;
}
//logger.warn("EMANFIRE:CRASH:"+endpoint.getLocation());
@@ -284,7 +284,7 @@ public class EndpointManagerImpl implements EndpointManager {
}
public void endpointNoLongerInUse(Endpoint endpoint) {
- if(endpoint.getMemberId()==null || cancelCriterion.cancelInProgress()!=null) {
+ if(endpoint.getMemberId()==null || cancelCriterion.isCancelInProgress()) {
return;
}
//logger.warn("EMANFIRE:LEFT:"+endpoint.getLocation());
@@ -292,7 +292,7 @@ public class EndpointManagerImpl implements EndpointManager {
}
public void endpointNowInUse(Endpoint endpoint) {
- if(cancelCriterion.cancelInProgress()!=null) {
+ if(cancelCriterion.isCancelInProgress()) {
return;
}
//logger.warn("EMANFIRE:JOIN:"+endpoint.getLocation()+" mid:"+endpoint.getMemberId(),new Exception());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InstantiatorRecoveryListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InstantiatorRecoveryListener.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InstantiatorRecoveryListener.java
index 16f7e60..8776863 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InstantiatorRecoveryListener.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/InstantiatorRecoveryListener.java
@@ -105,7 +105,7 @@ public class InstantiatorRecoveryListener extends EndpointManager.EndpointListen
@Override
public void run2() {
- if (pool.getCancelCriterion().cancelInProgress() != null) {
+ if (pool.getCancelCriterion().isCancelInProgress()) {
return;
}
synchronized(recoveryScheduledLock) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LiveServerPinger.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LiveServerPinger.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LiveServerPinger.java
index 1ab09da..4dfd79e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LiveServerPinger.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/LiveServerPinger.java
@@ -67,7 +67,7 @@ public class LiveServerPinger extends EndpointListenerAdapter {
TimeUnit.NANOSECONDS);
taskFutures.put(endpoint, future);
} catch (RejectedExecutionException e) {
- if (pool.getCancelCriterion().cancelInProgress() == null) {
+ if (!pool.getCancelCriterion().isCancelInProgress()) {
throw e;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
old mode 100755
new mode 100644
index 382d4a9..22e58f6
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueStateImpl.java
@@ -259,7 +259,7 @@ public class QueueStateImpl implements QueueState {
@Override
public void run2() {
SystemFailure.checkFailure();
- if (qManager.getPool().getCancelCriterion().cancelInProgress() != null) {
+ if (qManager.getPool().getCancelCriterion().isCancelInProgress()) {
return;
}
if (PoolImpl.BEFORE_SENDING_CLIENT_ACK_CALLBACK_FLAG) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestTracker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestTracker.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestTracker.java
index 5c48ece..1ba5028 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestTracker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/RegisterInterestTracker.java
@@ -215,7 +215,7 @@ public class RegisterInterestTracker {
true/*isClosing*/, keepAlive);
}
catch (Exception e) {
- if(srp.getPool().getCancelCriterion().cancelInProgress() == null) {
+ if (!srp.getPool().getCancelCriterion().isCancelInProgress()) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.RegisterInterestTracker_PROBLEM_REMOVING_ALL_INTEREST_ON_REGION_0_INTERESTTYPE_1_2,
new Object[] {regName, InterestType.getString(interestType), e.getLocalizedMessage()}));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
index a3f5e3b..4ee85a7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerImpl.java
@@ -721,7 +721,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
protected boolean prefill() {
try {
while (connectionCount < minConnections) {
- if (cancelCriterion.cancelInProgress() != null) {
+ if (cancelCriterion.isCancelInProgress()) {
return true;
}
boolean createdConnection= prefillConnection();
@@ -878,7 +878,7 @@ public class ConnectionManagerImpl implements ConnectionManager {
prefill();
lock.lock();
try {
- if(connectionCount < minConnections && cancelCriterion.cancelInProgress() == null) {
+ if(connectionCount < minConnections && !cancelCriterion.isCancelInProgress()) {
try {
backgroundProcessor.schedule(new PrefillConnectionsTask(), prefillRetry, TimeUnit.MILLISECONDS);
} catch(RejectedExecutionException e) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexManager.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexManager.java
index 82b8860..8ef82f1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexManager.java
@@ -1420,7 +1420,7 @@ public class IndexManager {
while (!this.shutdownRequested) {
// Termination checks
SystemFailure.checkFailure();
- if (stopper.cancelInProgress() != null) {
+ if (stopper.isCancelInProgress()) {
break;
}
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
index 29a9da7..e7d8c36 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
@@ -2371,7 +2371,7 @@ public class DistributionManager
return;
}
synchronized(this.membershipViewIdGuard) {
- while (this.membershipViewIdAcknowledged < id && this.stopper.cancelInProgress() == null) {
+ while (this.membershipViewIdAcknowledged < id && !this.stopper.isCancelInProgress()) {
if (logger.isDebugEnabled()) {
logger.debug("waiting for view {}. Current DM view processed by all listeners is {}", id, this.membershipViewIdAcknowledged);
}
@@ -2402,7 +2402,7 @@ public class DistributionManager
// bug 41539 - member events need to be delivered during shutdown
// or reply processors may hang waiting for replies from
// departed members
-// if (getCancelCriterion().cancelInProgress() != null) {
+// if (getCancelCriterion().isCancelInProgress()) {
// break; // no message, just quit
// }
if (!DistributionManager.this.system.isConnected &&
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
old mode 100755
new mode 100644
index 14a4d53..32f1bff
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
@@ -796,7 +796,7 @@ public class InternalDistributedSystem
if (this.dm == null) {
return false;
}
- if (this.dm.getCancelCriterion().cancelInProgress() != null) {
+ if (this.dm.getCancelCriterion().isCancelInProgress()) {
return false;
}
if (this.isDisconnecting) {
@@ -841,7 +841,7 @@ public class InternalDistributedSystem
if (this.dm == null) {
return true;
}
- if (this.dm.getCancelCriterion().cancelInProgress() != null) {
+ if (this.dm.getCancelCriterion().isCancelInProgress()) {
return true;
}
if (!this.isConnected) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
index f1caa5d..9f18e62 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
@@ -733,7 +733,7 @@ public class DirectChannel {
}
catch (Exception ex) {
// Don't freak out if the DM is shutting down
- if (this.conduit.getCancelCriterion().cancelInProgress() == null) {
+ if (!conduit.getCancelCriterion().isCancelInProgress()) {
logger.fatal(LocalizedMessage.create(LocalizedStrings.DirectChannel_WHILE_PULLING_A_MESSAGE), ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
old mode 100755
new mode 100644
index d02580e..21a0300
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
@@ -3537,7 +3537,7 @@ public class DLockGrantor {
boolean recalcTimeToWait = false;
while (!this.shutdown) {
// SystemFailure.checkFailure(); stopper checks this
- if (stopper.cancelInProgress() != null) {
+ if (stopper.isCancelInProgress()) {
break; // done
}
try {
@@ -3734,7 +3734,7 @@ public class DLockGrantor {
// if the VM is being forcibly disconnected, we shouldn't release locks as it
// will take longer than the time allowed by the InternalDistributedSystem
// shutdown mechanism.
- if (distMgr.getCancelCriterion().cancelInProgress() != null) {
+ if (distMgr.getCancelCriterion().isCancelInProgress()) {
return;
}
final boolean isDebugEnabled_DLS = logger.isTraceEnabled(LogMarker.DLS);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java
index 5e9d3c5..7314b61 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockService.java
@@ -528,11 +528,11 @@ public class DLockService extends DistributedLockService {
// assertion: grantor should now be either ready or destroyed!
if (myGrantor.isInitializing() &&
- dm.getCancelCriterion().cancelInProgress() == null) {
+ !dm.getCancelCriterion().isCancelInProgress()) {
logger.error(LogMarker.DLS, LocalizedMessage.create(LocalizedStrings.DLockService_GRANTOR_IS_STILL_INITIALIZING));
}
if (!success && !myGrantor.isDestroyed() &&
- dm.getCancelCriterion().cancelInProgress() == null) {
+ !dm.getCancelCriterion().isCancelInProgress()) {
logger.error(LogMarker.DLS, LocalizedMessage.create(
LocalizedStrings.DLockService_GRANTOR_CREATION_WAS_ABORTED_BUT_GRANTOR_WAS_NOT_DESTROYED));
}
@@ -1040,7 +1040,7 @@ public class DLockService extends DistributedLockService {
finally {
Assert.assertTrue(myGrantor == null
|| !myGrantor.isInitializing()
- || this.dm.getCancelCriterion().cancelInProgress() != null
+ || this.dm.getCancelCriterion().isCancelInProgress()
|| isDestroyed(),
"BecomeLockGrantor failed and left grantor non-ready");
}
@@ -2590,7 +2590,7 @@ public class DLockService extends DistributedLockService {
if (isCurrentlyLockGrantor || isMakingLockGrantor) {
// If forcedDisconnect is in progress, the membership view will not
// change and no-one else can contact this member, so don't wait for a grantor
- if (this.ds.getCancelCriterion().cancelInProgress() != null) {
+ if (this.ds.getCancelCriterion().isCancelInProgress()) {
// KIRK: probably don't need to waitForGrantor
try {
DLockGrantor.waitForGrantor(this);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
old mode 100755
new mode 100644
index bc59180..7d1f2d9
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/Services.java
@@ -370,10 +370,6 @@ public class Services {
return reasonForStopping;
}
- public boolean isCancelInProgress() {
- return cancelInProgress() != null;
- }
-
@Override
public RuntimeException generateCancelledException(Throwable e) {
String reason = cancelInProgress();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
old mode 100755
new mode 100644
index 87fac53..e5cac2d
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -852,7 +852,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
return false;
}
- if (!failedToRespond.isEmpty() && (services.getCancelCriterion().cancelInProgress() == null)) {
+ if (!failedToRespond.isEmpty() && (!services.getCancelCriterion().isCancelInProgress())) {
logger.warn("these members failed to respond to the view change: " + failedToRespond);
return false;
}
@@ -1710,7 +1710,7 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
Set<InternalDistributedMember> result = null;
long endOfWait = System.currentTimeMillis() + viewAckTimeout;
try {
- while (System.currentTimeMillis() < endOfWait && (services.getCancelCriterion().cancelInProgress() == null)) {
+ while (System.currentTimeMillis() < endOfWait && (!services.getCancelCriterion().isCancelInProgress())) {
try {
synchronized (this) {
if (!waiting || this.notRepliedYet.isEmpty() || this.conflictingView != null) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java
old mode 100755
new mode 100644
index 167193f..2ba319d
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/Transport.java
@@ -136,7 +136,9 @@ public class Transport extends UDP {
// overridden to implement AvailablePort response
@Override
public void receive(Address sender, byte[] data, int offset, int length) {
- if(data == null) return;
+ if (data == null || length <= 0) { // GEODE-1596 - check for empty messages
+ return;
+ }
// drop message from self; it has already been looped back up (https://issues.jboss.org/browse/JGRP-1765)
if(local_physical_addr != null && local_physical_addr.equals(sender))
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
old mode 100755
new mode 100644
index 72e0118..b755f6c
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -1709,7 +1709,7 @@ public class GMSMembershipManager implements MembershipManager, Manager
}
if (sentBytes == 0) {
- if (services.getCancelCriterion().cancelInProgress() != null) {
+ if (services.getCancelCriterion().isCancelInProgress()) {
throw new DistributedSystemDisconnectedException();
}
}
@@ -1832,7 +1832,7 @@ public class GMSMembershipManager implements MembershipManager, Manager
Set result = null;
boolean allDestinations = msg.forAll();
- if (services.getCancelCriterion().cancelInProgress() != null) {
+ if (services.getCancelCriterion().isCancelInProgress()) {
throw new DistributedSystemDisconnectedException("Distributed System is shutting down",
services.getCancelCriterion().generateCancelledException(null));
}
@@ -1914,7 +1914,7 @@ public class GMSMembershipManager implements MembershipManager, Manager
void checkAddressesForUUIDs(InternalDistributedMember[] addresses) {
for (int i=0; i<addresses.length; i++) {
InternalDistributedMember m = addresses[i];
- if(m != null) {
+ if (m != null) {
GMSMember id = (GMSMember)m.getNetMember();
if (!id.hasUUID()) {
latestViewLock.readLock().lock();
@@ -2295,7 +2295,7 @@ public class GMSMembershipManager implements MembershipManager, Manager
Thread.sleep(pauseTime);
}
} while (wait && (dc != null && dc.isOpen())
- && services.getCancelCriterion().cancelInProgress()==null );
+ && !services.getCancelCriterion().isCancelInProgress());
if (logger.isDebugEnabled()) {
logger.debug("operations for {} should all be in the cache at this point", mbr);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
index 38fc83d..ff9d2fb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
@@ -436,7 +436,7 @@ public abstract class HostStatSampler
}
protected final boolean stopRequested() {
- return stopper.cancelInProgress() != null || this.stopRequested;
+ return stopper.isCancelInProgress() || this.stopRequested;
}
public final SampleCollector getSampleCollector() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/StatAlertsManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/StatAlertsManager.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/StatAlertsManager.java
index 90d00e4..c1559a7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/StatAlertsManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/StatAlertsManager.java
@@ -354,7 +354,7 @@ public class StatAlertsManager {
final boolean isDebugEnabled = logger.isDebugEnabled();
synchronized (StatAlertsManager.this) {
- if (dm.getCancelCriterion().cancelInProgress() != null) {
+ if (dm.getCancelCriterion().isCancelInProgress()) {
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHostResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHostResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHostResponse.java
index 949e5ad..a9712be 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHostResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHostResponse.java
@@ -101,7 +101,7 @@ public final class FetchHostResponse extends AdminResponse {
File product = lib.getParentFile();
m.gemfireDir = product.getCanonicalFile();//may thro' IOException if url is not in a proper format
} catch (Exception ex) {
- if (dm != null && dm.getCancelCriterion().cancelInProgress() == null) {
+ if (dm != null && !dm.getCancelCriterion().isCancelInProgress()) {
logger.debug(ex.getMessage(), ex);
}
m.name = m.name != null ? m.name : DistributionConfig.DEFAULT_NAME;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
index d085c52..5fc9bb0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketAdvisor.java
@@ -2787,7 +2787,7 @@ public class BucketAdvisor extends CacheDistributionAdvisor {
* is not met
*/
private void handleException(Exception e, boolean loggit) {
- boolean safe = isClosed() || getAdvisee().getCancelCriterion().cancelInProgress() != null;
+ boolean safe = isClosed() || getAdvisee().getCancelCriterion().isCancelInProgress();
if (!safe) {
if (ENFORCE_SAFE_CLOSE) {
Assert.assertTrue(safe, LocalizedStrings.BucketAdvisor_BUCKETADVISOR_WAS_NOT_CLOSED_PROPERLY.toLocalizedString());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
index b32927e..abe38b6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegion.java
@@ -2271,7 +2271,7 @@ implements Bucket
return;
}
- if (bSize < 0 && getCancelCriterion().cancelInProgress() == null) {
+ if (bSize < 0 && !getCancelCriterion().isCancelInProgress()) {
throw new InternalGemFireError("Bucket " + this + " size (" +
bSize + ") negative after applying delta of " + memoryDelta);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
index 6c963e6..0aabda0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
@@ -2949,7 +2949,7 @@ public class DiskStoreImpl implements DiskStore {
return true;
}
CancelCriterion stopper = getCache().getCancelCriterion();
- if (stopper.cancelInProgress() != null) {
+ if (stopper.isCancelInProgress()) {
return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage.java
old mode 100755
new mode 100644
index af54945..a31d5e4
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegionFunctionStreamingMessage.java
@@ -292,7 +292,7 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa
*/
final public boolean checkCacheClosing(DistributionManager dm) {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- return (cache == null || cache.getCancelCriterion().cancelInProgress() != null);
+ return (cache == null || cache.getCancelCriterion().isCancelInProgress());
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/MemberFunctionStreamingMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/MemberFunctionStreamingMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/MemberFunctionStreamingMessage.java
old mode 100755
new mode 100644
index 3e05df2..a28d0f6
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/MemberFunctionStreamingMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/MemberFunctionStreamingMessage.java
@@ -365,7 +365,7 @@ public class MemberFunctionStreamingMessage extends DistributionMessage implemen
*/
final public boolean checkCacheClosing(DistributionManager dm) {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- return (cache == null || cache.getCancelCriterion().cancelInProgress() != null);
+ return (cache == null || cache.getCancelCriterion().isCancelInProgress());
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java
index c33efb7..9e01c1c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PRHARedundancyProvider.java
@@ -721,7 +721,7 @@ public class PRHARedundancyProvider
} catch (Exception e) {
// if region is going down, then no warning level logs
if (e instanceof CancelException || e instanceof CacheClosedException
- || (prRegion.getCancelCriterion().cancelInProgress() != null)) {
+ || (prRegion.getCancelCriterion().isCancelInProgress())) {
logger.debug("Exception trying choose a primary after bucket creation failure", e);
}
else {
@@ -832,7 +832,7 @@ public class PRHARedundancyProvider
//Don't elect ourselves as primary or tell others to persist our ID if this member
//has been destroyed.
- if(prRegion.getCancelCriterion().cancelInProgress() != null || prRegion.isDestroyed()) {
+ if(prRegion.getCancelCriterion().isCancelInProgress() || prRegion.isDestroyed()) {
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
old mode 100755
new mode 100644
index 39230c4..9ac95a1
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
@@ -5861,7 +5861,7 @@ public class PartitionedRegion extends LocalRegion implements
}
} catch (InterruptedException e) {
thr = e;
- if (this.cache.getCancelCriterion().cancelInProgress() == null) {
+ if (!cache.getCancelCriterion().isCancelInProgress()) {
if (logger.isDebugEnabled()) {
logger.debug("Invalidating partitioned region caught exception", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHelper.java
index 8fe8f45..e0d4f48 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegionHelper.java
@@ -324,7 +324,7 @@ public class PartitionedRegionHelper
{
try {
final GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- if(cache == null || cache.getCancelCriterion().cancelInProgress() != null) {
+ if(cache == null || cache.getCancelCriterion().isCancelInProgress()) {
return;
}
@@ -387,7 +387,7 @@ public class PartitionedRegionHelper
}
for (final Node node1 : nodeList) {
- if (cache.getCancelCriterion().cancelInProgress() != null) {
+ if (cache.getCancelCriterion().isCancelInProgress()) {
return;
}
if (node1.getMemberId().equals(failedMemId)) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXSynchronizationRunnable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXSynchronizationRunnable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXSynchronizationRunnable.java
index c4a40f7..c353be9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXSynchronizationRunnable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TXSynchronizationRunnable.java
@@ -76,7 +76,7 @@ public class TXSynchronizationRunnable implements Runnable {
}
if (this.secondRunnable == null) {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- if (cache == null || cache.getCancelCriterion().cancelInProgress() != null) {
+ if (cache == null || cache.getCancelCriterion().isCancelInProgress()) {
return;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
index dca792f..192e24d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/TombstoneService.java
@@ -828,7 +828,7 @@ public class TombstoneService {
if (logger.isTraceEnabled(LogMarker.TOMBSTONE)) {
logger.trace(LogMarker.TOMBSTONE, "Destroyed entries sweeper starting with sleep interval of {} milliseconds", EXPIRY_TIME);
}
- while (!isStopped && cancelCriterion.cancelInProgress() == null) {
+ while (!isStopped && !cancelCriterion.isCancelInProgress()) {
try {
updateStatistics();
SystemFailure.checkFailure();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueue.java
old mode 100755
new mode 100644
index c5746ed..85b50a1
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueue.java
@@ -2913,7 +2913,7 @@ protected boolean checkEventForRemoval(Long counter, ThreadIdentifier threadid,
if (shutdown) {
return true;
}
- if (cache.getCancelCriterion().cancelInProgress() != null) {
+ if (cache.getCancelCriterion().isCancelInProgress()) {
return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceImpl.java
old mode 100755
new mode 100644
index cb84845..6ddd2bc
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceImpl.java
@@ -242,7 +242,7 @@ public class TXLockServiceImpl extends TXLockService {
@Override
public boolean isDestroyed() {
- return this.dlock.isDestroyed() || this.system.getCancelCriterion().cancelInProgress() != null;
+ return this.dlock.isDestroyed() || this.system.getCancelCriterion().isCancelInProgress();
}
// -------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RecoveryRunnable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RecoveryRunnable.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RecoveryRunnable.java
index 93d5e61..b089f9b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RecoveryRunnable.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RecoveryRunnable.java
@@ -57,7 +57,7 @@ public abstract class RecoveryRunnable implements Runnable {
.getGemFireCache().getDistributedSystem().getCancelCriterion();
DistributedSystem.setThreadsSocketPolicy(true /* conserve sockets */);
SystemFailure.checkFailure();
- if (stopper.cancelInProgress() != null) {
+ if (stopper.isCancelInProgress()) {
return;
}
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java
index a5b4d71..8305a0d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/partitioned/RegionAdvisor.java
@@ -198,7 +198,7 @@ public class RegionAdvisor extends CacheDistributionAdvisor
this.preInitQueue = null; // prevent further additions to the queue
this.preInitQueueMonitor.notifyAll();
if (!finishedInitQueue &&
- getAdvisee().getCancelCriterion().cancelInProgress() == null) {
+ !getAdvisee().getCancelCriterion().isCancelInProgress()) {
logger.error(LocalizedMessage.create(LocalizedStrings.RegionAdvisor_FAILED_TO_PROCESS_ALL_QUEUED_BUCKETPROFILES_FOR_0, getAdvisee()));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/CachedRegionHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/CachedRegionHelper.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/CachedRegionHelper.java
old mode 100755
new mode 100644
index 8897dd7..db47175
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/CachedRegionHelper.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/CachedRegionHelper.java
@@ -81,7 +81,7 @@ public class CachedRegionHelper {
public boolean isShutdown() {
return shutdown
- || cache.getCancelCriterion().cancelInProgress() != null;
+ || cache.getCancelCriterion().isCancelInProgress();
}
public void close() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
old mode 100755
new mode 100644
index b6d19f9..e93faf8
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
@@ -1007,7 +1007,7 @@ public class AcceptorImpl extends Acceptor implements Runnable
if (((GemFireCacheImpl)this.cache).isClosed()) { // bug 38834
break; // TODO should just ask cache's CancelCriterion
}
- if (this.cache.getCancelCriterion().cancelInProgress() != null) {
+ if (this.cache.getCancelCriterion().isCancelInProgress()) {
break;
}
ServerConnection sc;
@@ -1044,7 +1044,7 @@ public class AcceptorImpl extends Acceptor implements Runnable
}
int events = this.selector.select();
// select() could have returned due to wakeup() during close of cache
- if (this.cache.getCancelCriterion().cancelInProgress() != null) {
+ if (this.cache.getCancelCriterion().isCancelInProgress()) {
break;
}
if (events == 0) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
old mode 100755
new mode 100644
index 92a668f..e080cbb
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
@@ -2634,7 +2634,7 @@ public class CacheClientProxy implements ClientSession {
ClientMessage clientMessage = null;
while (!isStopped()) {
// SystemFailure.checkFailure(); DM's stopper does this
- if (this._proxy._cache.getCancelCriterion().cancelInProgress() != null) {
+ if (this._proxy._cache.getCancelCriterion().isCancelInProgress()) {
break;
}
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
old mode 100755
new mode 100644
index 28b789a..391c3e6
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
@@ -1544,14 +1544,14 @@ public class CacheClientUpdater extends Thread implements ClientUpdater,
// de facto flag indicating we are to stop
return true;
}
- if (cache != null && cache.getCancelCriterion().cancelInProgress() != null) {
+ if (cache != null && cache.getCancelCriterion().isCancelInProgress()) {
// System is cancelling
return true;
}
// The pool stuff is really sick, so it's possible for us to have a distributed
// system that is not the same as our cache. Check it just in case...
- if (system.getCancelCriterion().cancelInProgress() != null) {
+ if (system.getCancelCriterion().isCancelInProgress()) {
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
old mode 100755
new mode 100644
index 37c6034..682e55b
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
@@ -587,7 +587,7 @@ public class ServerConnection implements Runnable {
private boolean isFiringMembershipEvents() {
return this.acceptor.isRunning()
&& !((GemFireCacheImpl)this.acceptor.getCachedRegionHelper().getCache()).isClosed()
- && this.acceptor.getCachedRegionHelper().getCache().getCancelCriterion().cancelInProgress() == null;
+ && !acceptor.getCachedRegionHelper().getCache().getCancelCriterion().isCancelInProgress();
}
protected void refuseHandshake(String msg, byte exception)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GatewayReceiverCommand.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
index e3a3d53..e83fd4c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GatewayReceiverCommand.java
@@ -448,7 +448,7 @@ public class GatewayReceiverCommand extends BaseCommand {
} catch (CancelException e) {
// FIXME better exception hierarchy would avoid this check
if (servConn.getCachedRegionHelper().getCache()
- .getCancelCriterion().cancelInProgress() != null) {
+ .getCancelCriterion().isCancelInProgress()) {
if (logger.isDebugEnabled()) {
logger.debug("{} ignoring message of type {} from client {} because shutdown occurred during message processing.", servConn.getName(), MessageType.getString(msg.getMessageType()), servConn.getProxyID());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
index e3e1a9e..0e83557 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractGatewaySenderEventProcessor.java
@@ -315,7 +315,7 @@ public abstract class AbstractGatewaySenderEventProcessor extends Thread {
if (this.isStopped) {
return true;
}
- if (sender.getStopper().cancelInProgress() != null) {
+ if (sender.getStopper().isCancelInProgress()) {
return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderAdvisor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderAdvisor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderAdvisor.java
index 8efd5fc..4410375 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderAdvisor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderAdvisor.java
@@ -458,8 +458,7 @@ public class GatewaySenderAdvisor extends DistributionAdvisor {
// no action necessary
}
catch (Exception e) {
- if (GatewaySenderAdvisor.this.sender
- .getStopper().cancelInProgress() == null) {
+ if (!sender.getStopper().isCancelInProgress()) {
logger.fatal(LocalizedMessage.create(
LocalizedStrings.GatewaySenderAdvisor_0_THE_THREAD_TO_OBTAIN_THE_FAILOVER_LOCK_WAS_INTERRUPTED__THIS_GATEWAY_SENDER_WILL_NEVER_BECOME_THE_PRIMARY,
GatewaySenderAdvisor.this), e);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
index 453e7f0..d703c6e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueue.java
@@ -1673,7 +1673,7 @@ public class ParallelGatewaySenderQueue implements RegionQueue {
if (shutdown) {
return true;
}
- if (cache.getCancelCriterion().cancelInProgress() != null) {
+ if (cache.getCancelCriterion().isCancelInProgress()) {
return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java
index b516ca1..57d6e34 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueue.java
@@ -1051,7 +1051,7 @@ public class SerialGatewaySenderQueue implements RegionQueue {
if (shutdown) {
return true;
}
- if (cache.getCancelCriterion().cancelInProgress() != null) {
+ if (cache.getCancelCriterion().isCancelInProgress()) {
return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CallbackSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CallbackSampler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CallbackSampler.java
index 0180fba..4bc3009 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CallbackSampler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/statistics/CallbackSampler.java
@@ -63,7 +63,7 @@ public class CallbackSampler {
}
private void sampleCallbacks() {
- if(cancelCriterion.cancelInProgress() != null) {
+ if(cancelCriterion.isCancelInProgress()) {
executor.shutdown();
}
int errors = 0;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
old mode 100755
new mode 100644
index 6528877..b5f9d79
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
@@ -845,7 +845,7 @@ public class Connection implements Runnable {
private void waitForAddressCompletion() {
InternalDistributedMember myAddr = this.owner.getConduit().getLocalAddress();
synchronized (myAddr) {
- while ((owner.getConduit().getCancelCriterion().cancelInProgress() == null)
+ while ((!owner.getConduit().getCancelCriterion().isCancelInProgress())
&& myAddr.getInetAddress() == null && myAddr.getVmViewId() < 0) {
try {
myAddr.wait(100); // spurious wakeup ok
@@ -1767,7 +1767,7 @@ public class Connection implements Runnable {
} catch (Exception ignore) {}
return; // exit loop and thread
} catch (IOException ex) {
- if (stopped || owner.getConduit().getCancelCriterion().cancelInProgress() != null) {
+ if (stopped || owner.getConduit().getCancelCriterion().isCancelInProgress()) {
try {
requestClose(LocalizedStrings.Connection_RUNNIOREADER_CAUGHT_SHUTDOWN.toLocalizedString());
} catch (Exception ignore) {}
@@ -1807,7 +1807,7 @@ public class Connection implements Runnable {
}
SystemFailure.checkFailure(); // throws
}
- if (this.owner.getConduit().getCancelCriterion().cancelInProgress() != null) {
+ if (this.owner.getConduit().getCancelCriterion().isCancelInProgress()) {
break;
}
@@ -1913,7 +1913,7 @@ public class Connection implements Runnable {
/** initiate suspect processing if a shared/ordered connection is lost and we're not shutting down */
private void initiateSuspicionIfSharedUnordered() {
if (this.isReceiver && this.handshakeRead && !this.preserveOrder && this.sharedResource) {
- if (this.owner.getConduit().getCancelCriterion().cancelInProgress() == null) {
+ if (!this.owner.getConduit().getCancelCriterion().isCancelInProgress()) {
this.owner.getDM().getMembershipManager().suspectMember(this.getRemoteAddress(),
INITIATING_SUSPECT_PROCESSING);
}
@@ -2017,7 +2017,7 @@ public class Connection implements Runnable {
input = new BufferedInputStream(getSocket().getInputStream(), INITIAL_CAPACITY);
}
catch (IOException io) {
- if (stopped || owner.getConduit().getCancelCriterion().cancelInProgress() != null) {
+ if (stopped || owner.getConduit().getCancelCriterion().isCancelInProgress()) {
return; // bug 37520: exit run loop (and thread)
}
logger.fatal(LocalizedMessage.create(LocalizedStrings.Connection_UNABLE_TO_GET_INPUT_STREAM), io);
@@ -2049,7 +2049,7 @@ public class Connection implements Runnable {
}
SystemFailure.checkFailure(); // throws
}
- if (this.owner.getConduit().getCancelCriterion().cancelInProgress() != null) {
+ if (this.owner.getConduit().getCancelCriterion().isCancelInProgress()) {
break;
}
int len = 0;
@@ -2428,7 +2428,7 @@ public class Connection implements Runnable {
// sleep a bit to avoid a hot error loop
try { Thread.sleep(1000); } catch (InterruptedException ie) {
Thread.currentThread().interrupt();
- if (this.owner.getConduit().getCancelCriterion().cancelInProgress() != null) {
+ if (this.owner.getConduit().getCancelCriterion().isCancelInProgress()) {
return;
}
break;
@@ -2436,7 +2436,7 @@ public class Connection implements Runnable {
}
} // IOException
catch (Exception e) {
- if (this.owner.getConduit().getCancelCriterion().cancelInProgress() != null) {
+ if (this.owner.getConduit().getCancelCriterion().isCancelInProgress()) {
return; // bug 37101
}
if (!stopped && !(e instanceof InterruptedException) ) {
@@ -2996,7 +2996,7 @@ public class Connection implements Runnable {
}
SystemFailure.checkFailure(); // throws
}
- if (this.owner.getConduit().getCancelCriterion().cancelInProgress() != null) {
+ if (this.owner.getConduit().getCancelCriterion().isCancelInProgress()) {
break;
}
flushId++;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
index ed570c1..f9d747b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
@@ -570,7 +570,7 @@ public class TCPConduit implements Runnable {
}
for(;;) {
SystemFailure.checkFailure();
- if (stopper.cancelInProgress() != null) {
+ if (stopper.isCancelInProgress()) {
break;
}
if (stopped) {
@@ -579,7 +579,7 @@ public class TCPConduit implements Runnable {
if (Thread.currentThread().isInterrupted()) {
break;
}
- if (stopper.cancelInProgress() != null) {
+ if (stopper.isCancelInProgress()) {
break; // part of bug 37271
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
index ff2f6fa..87ee0bc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceDUnitTest.java
@@ -546,8 +546,8 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
while (listener.crashes == 0) {
try {
long remaining = end - System.currentTimeMillis();
- if (remaining < 0) {
- break;
+ if (remaining <= 0) {
+ return;
}
listener.wait(remaining);
} catch (InterruptedException e) {
@@ -582,9 +582,9 @@ public class AutoConnectionSourceDUnitTest extends LocatorTestBase {
}
public static class MyListener extends ClientMembershipListenerAdapter implements Serializable {
- protected int crashes = 0;
- protected int joins = 0;
- protected int departures = 0;
+ protected volatile int crashes = 0;
+ protected volatile int joins = 0;
+ protected volatile int departures = 0;
@Override
public synchronized void memberCrashed(ClientMembershipEvent event) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
old mode 100755
new mode 100644
index ba9be84..2b156a9
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
@@ -310,7 +310,7 @@ public class GMSMembershipManagerJUnitTest {
Set<InternalDistributedMember> failures = manager.directChannelSend(recipients, m, null);
when(dc.send(any(GMSMembershipManager.class), any(mockMembers.getClass()), any(DistributionMessage.class), anyInt(), anyInt()))
.thenReturn(0);
- when(stopper.cancelInProgress()).thenReturn("stopping for test");
+ when(stopper.isCancelInProgress()).thenReturn(Boolean.TRUE);
try {
manager.directChannelSend(recipients, m, null);
fail("expected directChannelSend to throw an exception");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
index 0d1fea9..7c96d37 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SystemFailureDUnitTest.java
@@ -403,7 +403,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
// Let's inspect the distributed system. It should also
// be connected.
- if (basicGetSystem().getCancelCriterion().cancelInProgress() != null) {
+ if (basicGetSystem().getCancelCriterion().isCancelInProgress()) {
fail("distributed system cancel in progress");
return Boolean.FALSE;
}
@@ -463,7 +463,7 @@ public class SystemFailureDUnitTest extends DistributedCacheTestCase {
if (dm == null) {
return Boolean.TRUE;
}
- return new Boolean(dm.getCancelCriterion().cancelInProgress() != null);
+ return new Boolean(dm.getCancelCriterion().isCancelInProgress());
}
catch (CancelException e) {
// TODO -- it would be nice to avoid the checkConnected() call above
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/CallbackSamplerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/CallbackSamplerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/CallbackSamplerJUnitTest.java
index 9109ba7..47bfc58 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/CallbackSamplerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/CallbackSamplerJUnitTest.java
@@ -83,7 +83,7 @@ public class CallbackSamplerJUnitTest {
@Test
public void cancelCriterionShouldStopExecutor() {
Runnable sampleTask = invokeStartAndGetTask();
- when(cancelCriterion.cancelInProgress()).thenReturn("cancelled");
+ when(cancelCriterion.isCancelInProgress()).thenReturn(Boolean.TRUE);
sampleTask.run();
verify(executorService).shutdown();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
index 73218e0..d68abf0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -246,7 +246,7 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase impl
synchronized (JUnit4CacheTestCase.class) {
final GemFireCacheImpl gemFireCache = GemFireCacheImpl.getInstance();
if (gemFireCache != null && !gemFireCache.isClosed()
- && gemFireCache.getCancelCriterion().cancelInProgress() != null) {
+ && gemFireCache.getCancelCriterion().isCancelInProgress()) {
Wait.waitForCriterion(new WaitCriterion() { // TODO: replace with Awaitility
@Override
public boolean done() {
@@ -278,7 +278,7 @@ public abstract class JUnit4CacheTestCase extends JUnit4DistributedTestCase impl
synchronized (JUnit4CacheTestCase.class) {
final GemFireCacheImpl gemFireCache = GemFireCacheImpl.getInstance();
if (gemFireCache != null && !gemFireCache.isClosed()
- && gemFireCache.getCancelCriterion().cancelInProgress() != null) {
+ && gemFireCache.getCancelCriterion().isCancelInProgress()) {
Wait.waitForCriterion(new WaitCriterion() { // TODO: replace with Awaitility
@Override
public boolean done() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
index fa90e88..e1e158c 100644
--- a/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
+++ b/geode-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
@@ -1087,7 +1087,7 @@ public final class CqServiceImpl implements CqService {
.getQueueManager().getPool(), cqEvent.getEventID(), null);
Object newVal = null;
if (result == null || (newVal = result.getObject()) == null) {
- if (this.cache.getCancelCriterion().cancelInProgress() == null) {
+ if (!cache.getCancelCriterion().isCancelInProgress()) {
Exception ex = new Exception(
"Failed to retrieve full value from server for eventID "
+ cqEvent.getEventID());
@@ -1117,7 +1117,7 @@ public final class CqServiceImpl implements CqService {
}
// Handle client side exceptions.
} catch (Exception ex) {
- if (this.cache.getCancelCriterion().cancelInProgress() == null) {
+ if (!cache.getCancelCriterion().isCancelInProgress()) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.CqService_EXCEPTION_IN_THE_CQLISTENER_OF_THE_CQ_CQNAME_0_ERROR__1,
new Object[] { cqName, ex.getMessage()}));
@@ -1174,7 +1174,7 @@ public final class CqServiceImpl implements CqService {
}
// Handle client side exceptions.
} catch (Exception ex) {
- if (this.cache.getCancelCriterion().cancelInProgress() == null) {
+ if (!cache.getCancelCriterion().isCancelInProgress()) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.CqService_EXCEPTION_IN_THE_CQLISTENER_OF_THE_CQ_CQNAME_0_ERROR__1,
new Object[] { cqName, ex.getMessage()}));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/43528335/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
index 746ec46..faef65c 100644
--- a/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
+++ b/geode-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -574,7 +574,7 @@ public class GatewaySenderEventRemoteDispatcher implements
return true;
}
- if (cache.getCancelCriterion().cancelInProgress() != null) {
+ if (cache.getCancelCriterion().isCancelInProgress()) {
return true;
}
return false;