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 2015/10/15 23:36:01 UTC
[38/38] incubator-geode git commit: Merge remote-tracking branch
'origin/develop' into feature/GEODE-77
Merge remote-tracking branch 'origin/develop' into feature/GEODE-77
Conflicts:
gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/PooledExecutorWithDMStats.java
gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/jgroup/JGroupMembershipManager.java
gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/LocalizedStrings.java
gemfire-core/src/main/java/com/gemstone/gemfire/internal/i18n/ParentLocalizedStrings.java
gemfire-core/src/main/java/com/gemstone/gemfire/internal/logging/LogService.java
gemfire-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceWithUDPDUnitTest.java
gemfire-core/src/test/java/com/gemstone/gemfire/internal/FDDUnitTest.java
gemfire-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c4b14b72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c4b14b72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c4b14b72
Branch: refs/heads/feature/GEODE-77
Commit: c4b14b7244fc021c08ed4a5753887c0a493f527f
Parents: 3e1a9f6 21743ec
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Thu Oct 15 09:05:33 2015 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Thu Oct 15 09:25:15 2015 -0700
----------------------------------------------------------------------
README.md | 2 +-
build.gradle | 11 +-
gemfire-assembly/build.gradle | 9 +-
gemfire-assembly/src/main/dist/bin/gfsh | 2 +-
gemfire-assembly/src/main/dist/bin/gfsh.bat | 2 +-
.../com/gemstone/gemfire/DataSerializer.java | 11 +-
.../gemfire/admin/GemFireMemberStatus.java | 13 +-
.../gemfire/admin/SystemMemberBridgeServer.java | 5 +-
.../gemfire/admin/SystemMemberCache.java | 27 -
.../DistributedSystemHealthMonitor.java | 2 +-
.../admin/internal/SystemMemberCacheImpl.java | 17 +-
.../jmx/internal/SystemMemberCacheJmxImpl.java | 13 -
.../gemfire/cache/AttributesFactory.java | 31 -
.../java/com/gemstone/gemfire/cache/Cache.java | 27 -
.../gemfire/cache/DynamicRegionFactory.java | 121 +-
.../gemfire/cache/client/PoolFactory.java | 10 +-
.../cache/client/internal/AbstractOp.java | 2 +-
.../cache/client/internal/BridgePoolImpl.java | 479 -----
.../internal/BridgeServerLoadMessage.java | 99 --
.../client/internal/CacheServerLoadMessage.java | 99 ++
.../cache/client/internal/DestroyOp.java | 5 -
.../client/internal/EndpointManagerImpl.java | 8 +-
.../internal/ExplicitConnectionSourceImpl.java | 85 +-
.../gemfire/cache/client/internal/GetOp.java | 5 -
.../gemfire/cache/client/internal/PoolImpl.java | 14 +-
.../gemfire/cache/client/internal/PutOp.java | 5 -
.../cache/client/internal/QueueManagerImpl.java | 14 +-
.../cache/client/internal/QueueStateImpl.java | 6 +-
.../internal/RegisterDataSerializersOp.java | 8 +-
.../internal/RegisterInstantiatorsOp.java | 8 +-
.../client/internal/ServerRegionProxy.java | 44 +-
.../internal/FunctionServiceManager.java | 3 +-
.../cache/query/internal/CompiledSelect.java | 34 +-
.../cache/query/internal/DefaultQuery.java | 9 +-
.../gemfire/cache/server/ServerLoadProbe.java | 10 +-
.../gemfire/cache/server/ServerMetrics.java | 10 +-
.../cache/server/internal/LoadMonitor.java | 12 +-
.../gemfire/cache/util/BridgeClient.java | 156 --
.../gemfire/cache/util/BridgeLoader.java | 607 -------
.../gemfire/cache/util/BridgeMembership.java | 55 -
.../cache/util/BridgeMembershipEvent.java | 23 -
.../cache/util/BridgeMembershipListener.java | 41 -
.../util/BridgeMembershipListenerAdapter.java | 43 -
.../gemfire/cache/util/BridgeServer.java | 442 -----
.../gemfire/cache/util/BridgeWriter.java | 795 ---------
.../cache/util/BridgeWriterException.java | 48 -
.../util/EndpointDoesNotExistException.java | 34 -
.../gemfire/cache/util/EndpointException.java | 61 -
.../cache/util/EndpointExistsException.java | 28 -
.../cache/util/EndpointInUseException.java | 27 -
.../util/IncompatibleVersionException.java | 47 -
.../util/ServerRefusedConnectionException.java | 36 -
.../UniversalMembershipListenerAdapter.java | 352 ----
.../cache/util/UnknownVersionException.java | 39 -
.../gemfire/cache/util/VersionException.java | 45 -
.../gemstone/gemfire/cache/util/package.html | 3 -
.../gemfire/distributed/ServerLauncher.java | 4 +-
.../FunctionExecutionPooledExecutor.java | 7 +-
.../internal/InternalDistributedSystem.java | 12 +-
.../internal/PooledExecutorWithDMStats.java | 5 +-
.../distributed/internal/ServerLocator.java | 10 +-
.../gemstone/gemfire/internal/DSFIDFactory.java | 12 +-
.../internal/DataSerializableFixedID.java | 6 +-
.../internal/InternalDataSerializer.java | 33 +-
.../internal/admin/ClientStatsManager.java | 7 -
.../gemfire/internal/admin/GemFireVM.java | 2 +-
.../admin/remote/BridgeServerResponse.java | 18 +-
.../admin/remote/DurableClientInfoResponse.java | 4 +-
.../admin/remote/RemoteBridgeServer.java | 10 +-
.../internal/admin/remote/RemoteCacheInfo.java | 6 +-
.../internal/admin/remote/RemoteGemFireVM.java | 2 +-
.../internal/cache/AbstractBridgeServer.java | 425 -----
.../internal/cache/AbstractCacheServer.java | 398 +++++
.../gemfire/internal/cache/AbstractRegion.java | 52 -
.../gemfire/internal/cache/BridgeObserver.java | 89 -
.../internal/cache/BridgeObserverAdapter.java | 107 --
.../internal/cache/BridgeObserverHolder.java | 53 -
.../internal/cache/BridgeRegionEventImpl.java | 108 --
.../internal/cache/BridgeServerAdvisor.java | 165 --
.../internal/cache/BridgeServerImpl.java | 816 ---------
.../gemfire/internal/cache/BucketAdvisor.java | 2 +-
.../gemfire/internal/cache/CacheConfig.java | 8 +-
.../internal/cache/CacheServerAdvisor.java | 164 ++
.../gemfire/internal/cache/CacheServerImpl.java | 812 +++++++++
.../internal/cache/ClientRegionEventImpl.java | 108 ++
.../internal/cache/ClientServerObserver.java | 90 +
.../cache/ClientServerObserverAdapter.java | 107 ++
.../cache/ClientServerObserverHolder.java | 53 +
.../internal/cache/DestroyRegionOperation.java | 6 +-
.../cache/DistributedCacheOperation.java | 8 +-
.../cache/DistributedClearOperation.java | 6 +-
.../internal/cache/DistributedRegion.java | 6 -
.../gemfire/internal/cache/EntryExpiryTask.java | 3 +
.../gemfire/internal/cache/ExpiryTask.java | 60 +-
.../cache/FindDurableQueueProcessor.java | 4 +-
.../internal/cache/GemFireCacheImpl.java | 92 +-
.../gemfire/internal/cache/GridAdvisor.java | 6 +-
.../gemfire/internal/cache/LocalRegion.java | 48 +-
.../internal/cache/PartitionedRegion.java | 8 +-
.../gemfire/internal/cache/PoolFactoryImpl.java | 171 +-
.../gemfire/internal/cache/PoolManagerImpl.java | 19 -
.../gemfire/internal/cache/RegionEventImpl.java | 2 +-
.../internal/cache/RegionExpiryTask.java | 3 +
.../internal/cache/RemotePutMessage.java | 56 +-
.../internal/cache/doc-files/properties.html | 4 +-
.../cache/execute/InternalFunctionService.java | 4 +-
.../internal/cache/ha/HARegionQueue.java | 6 +-
.../PartitionedRegionObserverHolder.java | 2 +-
.../internal/cache/partitioned/PutMessage.java | 21 +-
.../internal/cache/tier/ConnectionProxy.java | 160 +-
.../cache/tier/InternalBridgeMembership.java | 715 --------
.../cache/tier/InternalClientMembership.java | 617 +++++++
.../cache/tier/sockets/AcceptorImpl.java | 20 +-
.../cache/tier/sockets/CacheClientNotifier.java | 16 +-
.../cache/tier/sockets/CacheClientProxy.java | 6 +-
.../cache/tier/sockets/CacheClientUpdater.java | 12 +-
.../tier/sockets/ClientBlacklistProcessor.java | 4 +-
.../RemoveClientFromBlacklistMessage.java | 4 +-
.../cache/tier/sockets/ServerConnection.java | 8 +-
.../doc-files/communication-architecture.fig | 4 +-
.../cache/xmlcache/BridgeServerCreation.java | 249 ---
.../internal/cache/xmlcache/CacheCreation.java | 47 +-
.../cache/xmlcache/CacheServerCreation.java | 238 +++
.../cache/xmlcache/CacheXmlGenerator.java | 41 +-
.../internal/cache/xmlcache/CacheXmlParser.java | 18 +-
.../cache/xmlcache/ClientCacheCreation.java | 5 -
.../xmlcache/RegionAttributesCreation.java | 9 -
.../gemfire/internal/i18n/LocalizedStrings.java | 32 +-
.../internal/i18n/ParentLocalizedStrings.java | 83 +-
.../gemfire/internal/logging/LogService.java | 128 +-
.../internal/logging/log4j/Configurator.java | 5 +
.../offheap/OffHeapCachedDeserializable.java | 20 +
.../offheap/SimpleMemoryAllocatorImpl.java | 36 +
.../gemfire/internal/offheap/StoredObject.java | 26 +-
.../internal/beans/CacheServerBridge.java | 18 +-
.../beans/GatewayReceiverMBeanBridge.java | 4 +-
.../internal/beans/ManagementAdapter.java | 42 +-
.../management/internal/beans/ServerBridge.java | 6 +-
.../cli/functions/ContunuousQueryFunction.java | 4 +-
.../functions/GetMemberInformationFunction.java | 4 +-
.../internal/cli/i18n/CliStrings.java | 2 +-
.../management/membership/ClientMembership.java | 8 +-
.../util/concurrent/SynchronousQueueNoSpin.java | 1144 ------------
.../gemfire/cache/cache-9.0.xsd | 26 -
.../internal/logging/log4j/log4j2-cli.xml | 17 -
.../internal/logging/log4j/log4j2-default.xml | 22 -
gemfire-core/src/main/resources/log4j2-cli.xml | 17 +
gemfire-core/src/main/resources/log4j2.xml | 23 +
.../batterytest/greplogs/ExpectedStrings.java | 3 +-
.../com/gemstone/gemfire/TXExpiryJUnitTest.java | 534 +++---
.../cache/AttributesFactoryJUnitTest.java | 18 -
.../gemstone/gemfire/cache/ClientHelper.java | 1 -
.../cache/ConnectionPoolAndLoaderDUnitTest.java | 4 +-
.../internal/AutoConnectionSourceDUnitTest.java | 23 +-
.../AutoConnectionSourceWithUDPDUnitTest.java | 140 ++
.../internal/ConnectionPoolImplJUnitTest.java | 11 +-
.../internal/LocatorLoadBalancingDUnitTest.java | 10 +-
.../cache/client/internal/LocatorTestBase.java | 12 +-
.../management/MemoryThresholdsDUnitTest.java | 4 +-
.../MemoryThresholdsOffHeapDUnitTest.java | 4 +-
.../gemfire/cache/query/QueryJUnitTest.java | 91 +
.../query/dunit/PdxStringQueryDUnitTest.java | 16 +-
.../query/dunit/QueryUsingPoolDUnitTest.java | 12 +-
.../cache/query/dunit/RemoteQueryDUnitTest.java | 90 +-
...esourceManagerWithQueryMonitorDUnitTest.java | 4 +-
.../cache/query/functional/GroupByTestImpl.java | 2 +-
.../query/functional/StructSetOrResultsSet.java | 260 ++-
...rrentIndexInitOnOverflowRegionDUnitTest.java | 4 +-
.../cache30/BridgeMembershipDUnitTest.java | 1644 ------------------
.../BridgeMembershipSelectorDUnitTest.java | 16 -
.../gemfire/cache30/BridgeTestCase.java | 376 ----
.../gemfire/cache30/BridgeWriterDUnitTest.java | 418 -----
.../cache30/BridgeWriterSelectorDUnitTest.java | 16 -
.../gemfire/cache30/Bug38741DUnitTest.java | 10 +-
.../gemfire/cache30/CacheXml30DUnitTest.java | 127 --
.../gemfire/cache30/CacheXml40DUnitTest.java | 8 +-
.../gemfire/cache30/CacheXml41DUnitTest.java | 28 +-
.../gemfire/cache30/CacheXml45DUnitTest.java | 4 +-
.../gemfire/cache30/CacheXml51DUnitTest.java | 8 +-
.../gemfire/cache30/CacheXml57DUnitTest.java | 1 -
.../cache30/ClientMembershipDUnitTest.java | 1644 ++++++++++++++++++
.../ClientMembershipSelectorDUnitTest.java | 16 +
.../ClientRegisterInterestDUnitTest.java | 418 +++++
...ClientRegisterInterestSelectorDUnitTest.java | 16 +
.../gemfire/cache30/ClientServerTestCase.java | 376 ++++
.../AbstractServerLauncherJUnitTestCase.java | 4 +-
.../ServerLauncherLocalJUnitTest.java | 4 +-
.../ServerLauncherRemoteJUnitTest.java | 8 +-
.../internal/ProductUseLogDUnitTest.java | 2 +-
.../disttx/DistributedTransactionDUnitTest.java | 4 +-
.../gemstone/gemfire/internal/FDDUnitTest.java | 12 +-
.../internal/cache/Bug39079DUnitTest.java | 6 +-
.../internal/cache/Bug41957DUnitTest.java | 6 +-
...ssagesRegionCreationAndDestroyJUnitTest.java | 10 +-
.../cache/ClientServerGetAllDUnitTest.java | 40 +-
.../cache/ClientServerTransactionDUnitTest.java | 6 +-
.../cache/ConcurrentMapOpsDUnitTest.java | 6 +-
.../cache/DeltaPropagationDUnitTest.java | 8 +-
.../cache/DeltaPropagationStatsDUnitTest.java | 2 +-
.../internal/cache/DiskRegionJUnitTest.java | 9 +-
.../internal/cache/EventTrackerDUnitTest.java | 8 +-
.../internal/cache/GridAdvisorDUnitTest.java | 106 +-
.../internal/cache/HABug36773DUnitTest.java | 8 +-
.../HAOverflowMemObjectSizerDUnitTest.java | 12 +-
.../cache/OldValueImporterTestBase.java | 165 ++
.../cache/RemotePutReplyMessageJUnitTest.java | 37 +
.../control/RebalanceOperationDUnitTest.java | 5 +-
.../cache/execute/Bug51193DUnitTest.java | 4 +-
.../internal/cache/functions/TestFunction.java | 10 +-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 8 +-
.../internal/cache/ha/Bug48571DUnitTest.java | 2 +-
.../cache/ha/EventIdOptimizationDUnitTest.java | 12 +-
.../internal/cache/ha/FailoverDUnitTest.java | 22 +-
.../internal/cache/ha/HABugInPutDUnitTest.java | 8 +-
.../internal/cache/ha/HAClearDUnitTest.java | 10 +-
.../cache/ha/HAConflationDUnitTest.java | 8 +-
.../internal/cache/ha/HADuplicateDUnitTest.java | 10 +-
.../cache/ha/HAEventIdPropagationDUnitTest.java | 10 +-
.../internal/cache/ha/HAGIIDUnitTest.java | 14 +-
.../cache/ha/HARQueueNewImplDUnitTest.java | 66 +-
.../cache/ha/HASlowReceiverDUnitTest.java | 10 +-
.../ha/OperationsPropagationDUnitTest.java | 8 +-
.../internal/cache/ha/PutAllDUnitTest.java | 12 +-
.../cache/ha/StatsBugDUnitDisabledTest.java | 14 +-
.../cache/partitioned/Bug43684DUnitTest.java | 4 +-
.../PutPutReplyMessageJUnitTest.java | 38 +
.../fixed/FixedPartitioningTestBase.java | 6 +-
.../tier/sockets/AcceptorImplJUnitTest.java | 62 +-
...rdCompatibilityCommandDUnitDisabledTest.java | 235 ---
...CompatibilityHandshakeDUnitDisabledTest.java | 218 ---
...mpatibilityHigherVersionClientDUnitTest.java | 4 +-
...rdCompatibilityMessageDUnitDisabledTest.java | 299 ----
.../BridgeServerMaxConnectionsJUnitTest.java | 221 ---
...geServerSelectorMaxConnectionsJUnitTest.java | 19 -
.../tier/sockets/BridgeWriterMiscDUnitTest.java | 1384 ---------------
.../BridgeWriterMiscSelectorDUnitTest.java | 27 -
.../cache/tier/sockets/Bug36269DUnitTest.java | 4 +-
.../cache/tier/sockets/Bug36457DUnitTest.java | 18 +-
.../cache/tier/sockets/Bug36805DUnitTest.java | 6 +-
.../cache/tier/sockets/Bug36995DUnitTest.java | 11 +-
.../cache/tier/sockets/Bug37210DUnitTest.java | 10 +-
.../CacheServerMaxConnectionsJUnitTest.java | 220 +++
...heServerSelectorMaxConnectionsJUnitTest.java | 19 +
.../cache/tier/sockets/CacheServerTestUtil.java | 51 +-
.../CacheServerTransactionsDUnitTest.java | 4 +-
.../tier/sockets/ClearPropagationDUnitTest.java | 4 +-
.../tier/sockets/ClientConflationDUnitTest.java | 20 +-
.../sockets/ClientHealthMonitorJUnitTest.java | 6 +-
.../sockets/ClientInterestNotifyDUnitTest.java | 14 +-
.../tier/sockets/ClientServerMiscDUnitTest.java | 1381 +++++++++++++++
.../ClientServerMiscSelectorDUnitTest.java | 27 +
.../cache/tier/sockets/ConflationDUnitTest.java | 24 +-
.../tier/sockets/ConnectionProxyJUnitTest.java | 257 +--
.../DataSerializerPropogationDUnitTest.java | 36 +-
.../DestroyEntryPropagationDUnitTest.java | 12 +-
.../DurableClientReconnectDUnitTest.java | 10 +-
.../sockets/DurableClientStatsDUnitTest.java | 10 +-
.../sockets/DurableRegistrationDUnitTest.java | 8 +-
.../sockets/DurableResponseMatrixDUnitTest.java | 10 +-
.../sockets/EventIDVerificationDUnitTest.java | 10 +-
.../ForceInvalidateEvictionDUnitTest.java | 10 +-
.../cache/tier/sockets/HAInterestBaseTest.java | 64 +-
.../tier/sockets/HAInterestPart2DUnitTest.java | 12 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 81 +-
.../tier/sockets/InterestListDUnitTest.java | 4 +-
.../sockets/InterestListEndpointDUnitTest.java | 18 +-
.../sockets/InterestListFailoverDUnitTest.java | 6 +-
.../sockets/InterestListRecoveryDUnitTest.java | 10 +-
.../sockets/InterestResultPolicyDUnitTest.java | 4 +-
.../tier/sockets/RedundancyLevelJUnitTest.java | 14 +-
.../sockets/RedundancyLevelPart1DUnitTest.java | 4 +-
.../sockets/RedundancyLevelPart3DUnitTest.java | 6 +-
.../tier/sockets/RedundancyLevelTestBase.java | 51 +-
.../tier/sockets/RegionCloseDUnitTest.java | 14 +-
...erInterestBeforeRegionCreationDUnitTest.java | 6 +-
.../sockets/RegisterInterestKeysDUnitTest.java | 4 +-
.../sockets/ReliableMessagingDUnitTest.java | 24 +-
.../internal/cache/tier/sockets/TestPut.java | 53 -
.../sockets/UpdatePropagationDUnitTest.java | 10 +-
...UpdatesFromNonInterestEndPointDUnitTest.java | 4 +-
.../logging/LogServiceIntegrationJUnitTest.java | 98 +-
.../internal/logging/LogServiceJUnitTest.java | 58 +-
.../LogServiceUserDirIntegrationJUnitTest.java | 70 -
.../logging/LoggingIntegrationTestSuite.java | 6 +-
.../internal/logging/LoggingUnitTestSuite.java | 15 +-
.../logging/MergeLogFilesJUnitTest.java | 4 +-
.../log4j/FastLoggerIntegrationJUnitTest.java | 4 +-
.../FastLoggerWithDefaultConfigJUnitTest.java | 4 +-
.../OffHeapWriteObjectAsByteArrayJUnitTest.java | 101 ++
...ersalMembershipListenerAdapterDUnitTest.java | 32 +-
.../gemfire/pdx/ByteSourceJUnitTest.java | 4 +-
.../pdx/PdxFormatterPutGetJUnitTest.java | 4 +-
.../test/java/dunit/DistributedTestCase.java | 4 +-
.../gemfire/codeAnalysis/excludedClasses.txt | 2 +-
.../sanctionedDataSerializables.txt | 14 +-
.../codeAnalysis/sanctionedSerializables.txt | 10 -
.../tier/sockets/RedundancyLevelJUnitTest.xml | 21 +-
297 files changed, 9447 insertions(+), 15371 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-assembly/build.gradle
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/DataSerializer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/QueueManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/PooledExecutorWithDMStats.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/PooledExecutorWithDMStats.java
index f15ac3f,a50e594..d07cd8d
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/PooledExecutorWithDMStats.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/PooledExecutorWithDMStats.java
@@@ -8,19 -8,18 +8,18 @@@
package com.gemstone.gemfire.distributed.internal;
-import java.util.concurrent.ThreadPoolExecutor;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.RejectedExecutionHandler;
-import java.util.concurrent.BlockingQueue;
import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
import com.gemstone.gemfire.SystemFailure;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
- import com.gemstone.java.util.concurrent.SynchronousQueueNoSpin;
-import java.util.List;
-
/**
* A ThreadPoolExecutor with stat support.
* @author darrel
@@@ -55,10 -54,10 +54,10 @@@ public class PooledExecutorWithDMStats
private Thread bufferConsumer;
private static BlockingQueue<Runnable> initQ(BlockingQueue<Runnable> q) {
- if (q instanceof SynchronousQueue || q instanceof SynchronousQueueNoSpin) {
+ if (q instanceof SynchronousQueue) {
return q;
} else {
- return new SynchronousQueue<Runnable>();
+ return new SynchronousQueue/*NoSpin*/<Runnable>();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DSFIDFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/internal/DataSerializableFixedID.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedCacheOperation.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/LocalRegion.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/doc-files/properties.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueue.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
----------------------------------------------------------------------
diff --cc gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
index 0b44cf4,b1464b9..50fec5d
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
@@@ -77,12 -77,10 +77,12 @@@ import com.gemstone.gemfire.internal.So
import com.gemstone.gemfire.internal.SocketUtils;
import com.gemstone.gemfire.internal.SystemTimer;
import com.gemstone.gemfire.internal.Version;
+import com.gemstone.gemfire.internal.VersionedDataInputStream;
+import com.gemstone.gemfire.internal.VersionedDataOutputStream;
- import com.gemstone.gemfire.internal.cache.BridgeObserver;
- import com.gemstone.gemfire.internal.cache.BridgeObserverHolder;
- import com.gemstone.gemfire.internal.cache.BridgeRegionEventImpl;
- import com.gemstone.gemfire.internal.cache.BridgeServerImpl;
+ import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+ import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
+ import com.gemstone.gemfire.internal.cache.ClientRegionEventImpl;
+ import com.gemstone.gemfire.internal.cache.CacheServerImpl;
import com.gemstone.gemfire.internal.cache.CacheClientStatus;
import com.gemstone.gemfire.internal.cache.CacheDistributionAdvisor;
import com.gemstone.gemfire.internal.cache.CachedDeserializable;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4b14b72/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------