Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2D452200CA6 for ; Tue, 9 May 2017 00:22:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2BD87160BBF; Mon, 8 May 2017 22:22:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 019C8160BA5 for ; Tue, 9 May 2017 00:22:32 +0200 (CEST) Received: (qmail 4706 invoked by uid 500); 8 May 2017 22:22:32 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 4531 invoked by uid 99); 8 May 2017 22:22:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 May 2017 22:22:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0786EE0005; Mon, 8 May 2017 22:22:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: klund@apache.org To: commits@geode.apache.org Date: Mon, 08 May 2017 22:22:33 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] geode git commit: GEODE-2738: Corrected misspellibng of "occured" to "occurred" archived-at: Mon, 08 May 2017 22:22:35 -0000 GEODE-2738: Corrected misspellibng of "occured" to "occurred" This closes #435 Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/05d80689 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/05d80689 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/05d80689 Branch: refs/heads/develop Commit: 05d80689167fba423407c21bb23d2171d6302ef3 Parents: b29e1bd Author: Patrick Rhomberg Authored: Fri May 5 15:49:45 2017 -0700 Committer: Kirk Lund Committed: Mon May 8 15:17:11 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/geode/DataSerializer.java | 2 +- .../client/internal/ExecuteFunctionNoAckOp.java | 4 +- .../internal/ExecuteRegionFunctionNoAckOp.java | 4 +- .../cache/client/internal/LiveServerPinger.java | 2 +- .../query/internal/AbstractCompiledValue.java | 2 +- .../cache/query/internal/CompiledSelect.java | 2 +- .../cache/query/internal/OrderByComparator.java | 2 +- .../geode/cache/query/internal/QueryUtils.java | 2 +- .../query/internal/cq/CqAttributesImpl.java | 6 +- .../query/internal/index/AbstractIndex.java | 8 +- .../query/internal/index/CompactRangeIndex.java | 10 +-- .../cache/query/internal/index/HashIndex.java | 8 +- .../query/internal/index/MemoryIndexStore.java | 3 +- .../internal/InternalDistributedSystem.java | 11 +-- .../distributed/internal/InternalLocator.java | 2 +- .../geode/internal/cache/AbstractRegionMap.java | 93 ++++++++++---------- .../geode/internal/cache/DiskStoreImpl.java | 4 +- .../geode/internal/cache/DistributedRegion.java | 6 +- ...stributedRegionFunctionStreamingMessage.java | 2 +- .../geode/internal/cache/GemFireCacheImpl.java | 2 +- .../geode/internal/cache/LocalRegion.java | 4 +- .../cache/MemberFunctionStreamingMessage.java | 4 +- .../org/apache/geode/internal/cache/Oplog.java | 32 +++---- .../geode/internal/cache/PRQueryProcessor.java | 2 +- .../geode/internal/cache/PartitionedRegion.java | 4 +- .../cache/PartitionedRegionDataStore.java | 2 +- .../internal/cache/PlaceHolderDiskRegion.java | 2 +- .../geode/internal/cache/ProxyRegionMap.java | 8 +- .../cache/UpdateEntryVersionOperation.java | 2 +- .../cache/control/HeapMemoryMonitor.java | 2 +- .../cache/control/OffHeapMemoryMonitor.java | 2 +- .../cache/execute/AbstractExecution.java | 2 +- .../cache/execute/FunctionServiceStats.java | 6 +- .../internal/cache/execute/FunctionStats.java | 6 +- .../ServerToClientFunctionResultSender.java | 2 +- .../geode/internal/cache/ha/HARegionQueue.java | 4 +- .../cache/tier/sockets/CacheClientProxy.java | 12 +-- .../sockets/command/GatewayReceiverCommand.java | 2 +- .../AbstractGatewaySenderEventProcessor.java | 4 +- .../cache/wan/GatewayReceiverStats.java | 20 ++--- .../ParallelQueueBatchRemovalMessage.java | 2 +- .../parallel/ParallelQueueRemovalMessage.java | 4 +- .../cache/wan/serial/BatchDestroyOperation.java | 2 +- .../FacetsJCAConnectionManagerImpl.java | 4 +- .../datasource/GemFireConnPooledDataSource.java | 2 +- .../GemFireTransactionDataSource.java | 7 +- .../datasource/JCAConnectionManagerImpl.java | 4 +- .../geode/internal/i18n/LocalizedStrings.java | 52 +++++------ .../geode/internal/jta/GlobalTransaction.java | 6 +- .../internal/logging/LoggingThreadGroup.java | 2 +- .../geode/internal/tcp/MsgDestreamer.java | 2 +- .../org/apache/geode/management/JVMMetrics.java | 2 +- .../internal/beans/stats/StatsKey.java | 2 +- .../internal/cli/commands/ShellCommands.java | 2 +- .../internal/cli/i18n/CliStrings.java | 24 ++--- .../batterytest/greplogs/ExpectedStrings.java | 2 +- .../geode/JtaNoninvolvementJUnitTest.java | 8 +- .../geode/cache/ConnectionPoolDUnitTest.java | 4 +- .../PartitionRegionHelperDUnitTest.java | 4 +- .../geode/cache/query/QueryJUnitTest.java | 2 +- .../functional/IndexCreationJUnitTest.java | 2 +- .../cache/query/functional/MiscJUnitTest.java | 10 +-- .../query/internal/IndexManagerJUnitTest.java | 2 +- .../index/AsynchIndexMaintenanceJUnitTest.java | 8 +- .../internal/index/HashIndexSetJUnitTest.java | 2 +- .../PRQueryCacheClosedJUnitTest.java | 4 +- .../PRQueryRegionClosedJUnitTest.java | 4 +- .../PRQueryRegionDestroyedJUnitTest.java | 4 +- .../geode/cache30/DiskRegionDUnitTest.java | 2 +- .../geode/internal/cache/Bug37377DUnitTest.java | 8 +- ...entFlushingAndRegionOperationsJUnitTest.java | 34 +++---- .../ConcurrentRegionOperationsJUnitTest.java | 74 ++++++++-------- ...rentRollingAndRegionOperationsJUnitTest.java | 31 +++---- .../cache/DeltaPropagationDUnitTest.java | 10 +-- .../cache/DiskLruRegRecoveryJUnitTest.java | 2 +- .../DiskRegOplogSwtchingAndRollerJUnitTest.java | 6 +- .../cache/DiskRegRecoveryJUnitTest.java | 8 +- ...iskRegionIllegalCacheXMLvaluesJUnitTest.java | 8 +- .../internal/cache/DiskRegionJUnitTest.java | 71 +++++++-------- .../internal/cache/MapInterface2JUnitTest.java | 8 +- .../internal/cache/MapInterfaceJUnitTest.java | 18 ++-- .../geode/internal/cache/OplogJUnitTest.java | 50 +++++------ .../PartitionedRegionDestroyDUnitTest.java | 4 +- .../PersistentPartitionedRegionJUnitTest.java | 2 +- .../cache/SimpleDiskRegionJUnitTest.java | 14 +-- ...ributedRegionFunctionExecutionDUnitTest.java | 8 +- .../execute/FunctionServiceStatsDUnitTest.java | 6 +- .../MemberFunctionExecutionDUnitTest.java | 10 +-- ...egionFunctionExecutionFailoverDUnitTest.java | 4 +- ...onFunctionExecutionNoSingleHopDUnitTest.java | 6 +- ...onExecutionSelectorNoSingleHopDUnitTest.java | 6 +- ...gionFunctionExecutionSingleHopDUnitTest.java | 6 +- .../execute/PRFunctionExecutionDUnitTest.java | 8 +- .../execute/PRPerformanceTestDUnitTest.java | 2 +- .../cache/ha/BlockingHARegionJUnitTest.java | 28 +++--- .../ha/BlockingHARegionQueueJUnitTest.java | 4 +- .../cache/ha/Bug36853EventsExpiryDUnitTest.java | 2 +- .../cache/ha/EventIdOptimizationDUnitTest.java | 2 +- .../cache/ha/HARegionQueueDUnitTest.java | 2 +- .../cache/ha/HARegionQueueJUnitTest.java | 2 +- .../ha/HARegionQueueStartStopJUnitTest.java | 14 +-- .../tier/sockets/HAInterestPart2DUnitTest.java | 2 +- .../cache/tier/sockets/HAInterestTestCase.java | 6 +- .../tier/sockets/InterestListDUnitTest.java | 2 +- .../sockets/NewRegionAttributesDUnitTest.java | 66 +++++++------- .../internal/datasource/CleanUpJUnitTest.java | 4 +- .../ConnectionPoolCacheImplJUnitTest.java | 10 +-- .../datasource/ConnectionPoolingJUnitTest.java | 2 +- .../jta/GlobalTransactionJUnitTest.java | 32 +++---- .../internal/jta/dunit/ExceptionsDUnitTest.java | 24 ++--- .../jta/dunit/TransactionTimeOutDUnitTest.java | 50 +++++------ .../internal/jta/dunit/TxnTimeOutDUnitTest.java | 20 ++--- .../internal/jta/functional/CacheJUnitTest.java | 2 +- .../security/ClientAuthorizationTestCase.java | 6 +- .../cache/query/internal/cq/CqEventImpl.java | 2 +- .../recovering_from_p2p_crashes.html.md.erb | 2 +- .../tools/pulse/internal/data/Cluster.java | 2 +- .../pulse/internal/data/JMXDataUpdater.java | 2 +- .../src/main/webapp/scripts/lib/jquery-1.7.2.js | 2 +- .../main/webapp/scripts/pulsescript/common.js | 2 +- .../geode/internal/cache/wan/WANTestBase.java | 4 +- 121 files changed, 589 insertions(+), 583 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/DataSerializer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializer.java b/geode-core/src/main/java/org/apache/geode/DataSerializer.java index 58518f4..c85bc88 100644 --- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java +++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java @@ -2952,7 +2952,7 @@ public abstract class DataSerializer { * loaded using the current thread's {@link Thread#getContextClassLoader context class loader} * before the one normally used by Java serialization is consulted. * - * @throws IOException A problem occured while reading from in (may wrap another + * @throws IOException A problem occurred while reading from in (may wrap another * exception) * @throws ClassNotFoundException The class of an object read from in could not be * found http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java index def7389..e819bc9 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java @@ -86,7 +86,7 @@ public class ExecuteFunctionNoAckOp { } catch (Exception ex) { if (logger.isDebugEnabled()) { logger.debug( - "ExecuteFunctionNoAckOp#execute : Exception occured while Sending Function Execution Message:" + "ExecuteFunctionNoAckOp#execute : Exception occurred while Sending Function Execution Message:" + op.getMessage() + " to server using pool: " + pool, ex); } @@ -127,7 +127,7 @@ public class ExecuteFunctionNoAckOp { } catch (Exception ex) { if (logger.isDebugEnabled()) { logger.debug( - "ExecuteFunctionNoAckOp#execute : Exception occured while Sending Function Execution Message:" + "ExecuteFunctionNoAckOp#execute : Exception occurred while Sending Function Execution Message:" + op.getMessage() + " to server using pool: " + pool, ex); } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java index 06f02d1..3eac654 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionNoAckOp.java @@ -69,7 +69,7 @@ public class ExecuteRegionFunctionNoAckOp { } catch (Exception ex) { if (logger.isDebugEnabled()) { logger.debug( - "ExecuteRegionFunctionNoAckOp#execute : Exception occured while Sending Function Execution Message: {} to server using pool: {}", + "ExecuteRegionFunctionNoAckOp#execute : Exception occurred while Sending Function Execution Message: {} to server using pool: {}", op.getMessage(), pool, ex); } if (ex.getMessage() != null) @@ -94,7 +94,7 @@ public class ExecuteRegionFunctionNoAckOp { } catch (Exception ex) { if (logger.isDebugEnabled()) { logger.debug( - "ExecuteRegionFunctionNoAckOp#execute : Exception occured while Sending Function Execution Message: {} to server using pool: {}", + "ExecuteRegionFunctionNoAckOp#execute : Exception occurred while Sending Function Execution Message: {} to server using pool: {}", op.getMessage(), pool, ex); } if (ex.getMessage() != null) http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/cache/client/internal/LiveServerPinger.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/LiveServerPinger.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/LiveServerPinger.java index 32d0f8e..066e737 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/LiveServerPinger.java +++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/LiveServerPinger.java @@ -90,7 +90,7 @@ public class LiveServerPinger extends EndpointListenerAdapter { PingOp.execute(pool, endpoint.getLocation()); } catch (Exception e) { if (logger.isDebugEnabled()) { - logger.debug("Error occured while pinging server: {} - {}", endpoint.getLocation(), + logger.debug("Error occurred while pinging server: {} - {}", endpoint.getLocation(), e.getMessage()); } GemFireCacheImpl cache = GemFireCacheImpl.getInstance(); http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java index d635e02..bed0680 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AbstractCompiledValue.java @@ -57,7 +57,7 @@ public abstract class AbstractCompiledValue implements CompiledValue, Filter, OQ throws FunctionDomainException, TypeMismatchException, NameResolutionException, QueryInvocationTargetException { Support.assertionFailed( - "This method should not have invoked as CompieldComparison & CompiledUndefined are the only classes on which this invocation should have occured "); + "This method should not have invoked as CompieldComparison & CompiledUndefined are the only classes on which this invocation should have occurred "); return null; } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java index 9b77557..0ecc746 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledSelect.java @@ -420,7 +420,7 @@ public class CompiledSelect extends AbstractCompiledValue { CompiledIteratorDef iterDef = (CompiledIteratorDef) iter.next(); RuntimeIterator rIter = iterDef.getRuntimeIterator(context); context.bindIterator(rIter); - // Asif . Ideally the function below should always be called after binding has occured + // Asif . Ideally the function below should always be called after binding has occurred // So that the interal ID gets set during binding to the scope. If not so then chances // are that internal_id is still null causing index_interanl_id to be null. // Though in our case it may not be an issue as the compute depedency phase must have http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java index b9d6026..3fdb11b 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/OrderByComparator.java @@ -96,7 +96,7 @@ public class OrderByComparator implements Comparator { Object[] list2 = this.evaluateSortCriteria(obj2); if (list1.length != list2.length) { - Support.assertionFailed("Error Occured due to improper sort criteria evaluation "); + Support.assertionFailed("Error Occurred due to improper sort criteria evaluation "); } else { for (int i = 0; i < list1.length; i++) { Object arr1[] = (Object[]) list1[i]; http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java index 8eaa74a..805282a 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryUtils.java @@ -1719,7 +1719,7 @@ class IndexConditioningHelper { * fields in the resultset obtained from Index usage. This List will be populated only if there * exists fields in index resultset which will not be selected.If all the fields of index * resultset will be used , then this List should be null or empty. It is used in preventing - * unnecessary expansion of same type, when a similar expansion has already occured. as for eg + * unnecessary expansion of same type, when a similar expansion has already occurred. as for eg * * consider a index result containing 3 fields field1 field2 & field3 . Assume that field3 is for * cutdown. Since the expansion iterators can either be independent of all the fields in the index http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java index 7aeee1d..72e0d84 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/cq/CqAttributesImpl.java @@ -155,7 +155,7 @@ public class CqAttributesImpl implements CqAttributes, CqAttributesMutator, Clon // Handle client side exceptions. } catch (Exception ex) { logger.warn(LocalizedMessage.create( - LocalizedStrings.CqAttributesFactory_EXCEPTION_OCCURED_WHILE_CLOSING_CQ_LISTENER_ERROR_0, + LocalizedStrings.CqAttributesFactory_EXCEPTION_OCCURRED_WHILE_CLOSING_CQ_LISTENER_ERROR_0, ex.getLocalizedMessage())); if (logger.isDebugEnabled()) { logger.debug(ex.getMessage(), ex); @@ -173,7 +173,7 @@ public class CqAttributesImpl implements CqAttributes, CqAttributesMutator, Clon // is still usable: SystemFailure.checkFailure(); logger.warn(LocalizedMessage.create( - LocalizedStrings.CqAttributesFactory_RUNTIME_EXCEPTION_OCCURED_WHILE_CLOSING_CQ_LISTENER_ERROR_0, + LocalizedStrings.CqAttributesFactory_RUNTIME_EXCEPTION_OCCURRED_WHILE_CLOSING_CQ_LISTENER_ERROR_0, t.getLocalizedMessage())); if (logger.isDebugEnabled()) { logger.debug(t.getMessage(), t); @@ -227,7 +227,7 @@ public class CqAttributesImpl implements CqAttributes, CqAttributesMutator, Clon // is still usable: SystemFailure.checkFailure(); logger.warn(LocalizedMessage.create( - LocalizedStrings.CqAttributesFactory_RUNTIME_EXCEPTION_OCCURED_CLOSING_CQ_LISTENER_ERROR_0, + LocalizedStrings.CqAttributesFactory_RUNTIME_EXCEPTION_OCCURRED_CLOSING_CQ_LISTENER_ERROR_0, t.getLocalizedMessage())); if (logger.isDebugEnabled()) { logger.debug(t.getMessage(), t); http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/AbstractIndex.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/AbstractIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/AbstractIndex.java index 96a3c83..44541d0 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/AbstractIndex.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/AbstractIndex.java @@ -939,7 +939,7 @@ public abstract class AbstractIndex implements IndexProtocol { private int initEntriesUpdated = 0; - private boolean hasInitOccuredOnce = false; + private boolean hasInitOccurredOnce = false; private ExecutionContext initContext = null; @@ -1047,7 +1047,7 @@ public abstract class AbstractIndex implements IndexProtocol { for (int i = 0; i < this.iteratorSize; i++) { CompiledIteratorDef iterDef = (CompiledIteratorDef) this.indexInitIterators.get(i); RuntimeIterator rIter = null; - if (!this.hasInitOccuredOnce) { + if (!this.hasInitOccurredOnce) { iterDef.computeDependencies(this.initContext); rIter = iterDef.getRuntimeIterator(this.initContext); this.initContext.addToIndependentRuntimeItrMapForIndexCreation(iterDef); @@ -1057,7 +1057,7 @@ public abstract class AbstractIndex implements IndexProtocol { } this.initContext.bindIterator(rIter); } - this.hasInitOccuredOnce = true; + this.hasInitOccurredOnce = true; if (this.indexResultSetType == null) { this.indexResultSetType = createIndexResultSetType(); } @@ -1345,7 +1345,7 @@ public abstract class AbstractIndex implements IndexProtocol { // TODO: Create a new LocalizedString for this. if (logger.isDebugEnabled()) { logger.debug( - "Exception occured while verifying a Region Entry value during a Query when the Region Entry is under update operation", + "Exception occurred while verifying a Region Entry value during a Query when the Region Entry is under update operation", e); } } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java index 80568f5..2bea4a6 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactRangeIndex.java @@ -1174,8 +1174,8 @@ public class CompactRangeIndex extends AbstractIndex { private CompiledValue modifiedIndexExpr = null; private ObjectType addnlProjType = null; private int initEntriesUpdated = 0; - private boolean hasInitOccuredOnce = false; - private boolean hasIndxUpdateOccuredOnce = false; + private boolean hasInitOccurredOnce = false; + private boolean hasIndxUpdateOccurredOnce = false; private ExecutionContext initContext = null; private int iteratorSize = -1; @@ -1464,7 +1464,7 @@ public class CompactRangeIndex extends AbstractIndex { for (int i = 0; i < this.iteratorSize; i++) { CompiledIteratorDef iterDef = (CompiledIteratorDef) this.indexInitIterators.get(i); RuntimeIterator rIter = null; - if (!this.hasInitOccuredOnce) { + if (!this.hasInitOccurredOnce) { iterDef.computeDependencies(this.initContext); rIter = iterDef.getRuntimeIterator(this.initContext); this.initContext.addToIndependentRuntimeItrMapForIndexCreation(iterDef); @@ -1474,7 +1474,7 @@ public class CompactRangeIndex extends AbstractIndex { } this.initContext.bindIterator(rIter); } - this.hasInitOccuredOnce = true; + this.hasInitOccurredOnce = true; if (this.indexResultSetType == null) { this.indexResultSetType = createIndexResultSetType(); } @@ -1725,7 +1725,7 @@ public class CompactRangeIndex extends AbstractIndex { // We obtain the object currently in vm, we are using this old value // only to detect if in place modifications have occurred // if the object is not in memory, obviously an in place modification could - // not have occured + // not have occurred this.oldValue = indexStore.getTargetObjectInVM(entry); } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java index 023fbb4..eced77e 100755 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/HashIndex.java @@ -1085,8 +1085,8 @@ public class HashIndex extends AbstractIndex { private CompiledValue modifiedIndexExpr = null; private ObjectType addnlProjType = null; private int initEntriesUpdated = 0; - private boolean hasInitOccuredOnce = false; - private boolean hasIndxUpdateOccuredOnce = false; + private boolean hasInitOccurredOnce = false; + private boolean hasIndxUpdateOccurredOnce = false; private ExecutionContext initContext = null; private int iteratorSize = -1; @@ -1186,7 +1186,7 @@ public class HashIndex extends AbstractIndex { for (int i = 0; i < this.iteratorSize; i++) { CompiledIteratorDef iterDef = (CompiledIteratorDef) this.indexInitIterators.get(i); RuntimeIterator rIter = null; - if (!this.hasInitOccuredOnce) { + if (!this.hasInitOccurredOnce) { iterDef.computeDependencies(this.initContext); rIter = iterDef.getRuntimeIterator(this.initContext); this.initContext.addToIndependentRuntimeItrMapForIndexCreation(iterDef); @@ -1196,7 +1196,7 @@ public class HashIndex extends AbstractIndex { } this.initContext.bindIterator(rIter); } - this.hasInitOccuredOnce = true; + this.hasInitOccurredOnce = true; if (this.indexResultSetType == null) { this.indexResultSetType = createIndexResultSetType(); } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java index e9cd070..05a30c6 100644 --- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java +++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/MemoryIndexStore.java @@ -329,7 +329,8 @@ public class MemoryIndexStore implements IndexStore { DefaultQuery.testHook.doTestHook("REMOVE_CALLED_FROM_ELEM_ARRAY"); } // This could be IndexElementArray and might be changing to Set - // If the remove occured before changing to a set, then next time it will not be "found" + // If the remove occurred before changing to a set, then next time it will not be + // "found" // However the end effect would be that it was removed if (entries instanceof IndexElemArray) { if (!this.valueToEntriesMap.replace(newKey, entries, entries)) { http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java index 86bc7a4..3418c58 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java @@ -2704,7 +2704,7 @@ public class InternalDistributedSystem extends DistributedSystem if (e.getMessage().contains("Rejecting the attempt of a member using an older version")) { logger.warn( LocalizedMessage.create( - LocalizedStrings.InternalDistributedSystem_EXCEPTION_OCCURED_WHILE_TRYING_TO_CONNECT_THE_SYSTEM_DURING_RECONNECT), + LocalizedStrings.InternalDistributedSystem_EXCEPTION_OCCURRED_WHILE_TRYING_TO_CONNECT_THE_SYSTEM_DURING_RECONNECT), e); attemptingToReconnect = false; return; @@ -2718,7 +2718,7 @@ public class InternalDistributedSystem extends DistributedSystem } catch (Exception ee) { logger.warn( LocalizedMessage.create( - LocalizedStrings.InternalDistributedSystem_EXCEPTION_OCCURED_WHILE_TRYING_TO_CONNECT_THE_SYSTEM_DURING_RECONNECT), + LocalizedStrings.InternalDistributedSystem_EXCEPTION_OCCURRED_WHILE_TRYING_TO_CONNECT_THE_SYSTEM_DURING_RECONNECT), ee); attemptingToReconnect = false; return; @@ -2750,20 +2750,21 @@ public class InternalDistributedSystem extends DistributedSystem // this try failed. The new cache will call reconnect again } } catch (CacheXmlException e) { - logger.warn("Exception occured while trying to create the cache during reconnect", e); + logger.warn("Exception occurred while trying to create the cache during reconnect", + e); reconnectDS.disconnect(); reconnectDS = null; reconnectCancelled = true; break; } catch (CancelException ignor) { - logger.warn("Exception occured while trying to create the cache during reconnect", + logger.warn("Exception occurred while trying to create the cache during reconnect", ignor); reconnectDS.disconnect(); reconnectDS = null; } catch (Exception e) { logger.warn( LocalizedMessage.create( - LocalizedStrings.InternalDistributedSystem_EXCEPTION_OCCURED_WHILE_TRYING_TO_CREATE_THE_CACHE_DURING_RECONNECT), + LocalizedStrings.InternalDistributedSystem_EXCEPTION_OCCURRED_WHILE_TRYING_TO_CREATE_THE_CACHE_DURING_RECONNECT), e); } } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java index 4ac2c9c..6febcd8 100644 --- a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java +++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java @@ -1255,7 +1255,7 @@ public class InternalLocator extends Locator implements ConnectListener { try { response = statusFuture.get(5, TimeUnit.SECONDS); } catch (Exception e) { - logger.info("Exception occured while fetching the status {}", CliUtil.stackTraceAsString(e)); + logger.info("Exception occurred while fetching the status {}", CliUtil.stackTraceAsString(e)); response = new SharedConfigurationStatusResponse(); response.setStatus(SharedConfigurationStatus.UNDETERMINED); } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java index bc9fcdf..0f79b80 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java @@ -1591,7 +1591,7 @@ public abstract class AbstractRegionMap implements RegionMap { if (txEvent != null) { txEvent.addDestroy(owner, re, re.getKey(), aCallbackArgument); } - boolean clearOccured = false; + boolean clearOccurred = false; try { processAndGenerateTXVersionTag(owner, cbEvent, re, txEntryState); if (inTokenMode) { @@ -1618,10 +1618,10 @@ public abstract class AbstractRegionMap implements RegionMap { EntryLogger.logTXDestroy(_getOwnerObject(), key); owner.updateSizeOnRemove(key, oldSize); } catch (RegionClearedException rce) { - clearOccured = true; + clearOccurred = true; } owner.txApplyDestroyPart2(re, re.getKey(), inTokenMode, - clearOccured /* Clear Conflciting with the operation */); + clearOccurred /* Clear Conflciting with the operation */); if (invokeCallbacks) { switchEventOwnerAndOriginRemote(cbEvent, hasRemoteOrigin); if (pendingCallbacks == null) { @@ -1632,7 +1632,7 @@ public abstract class AbstractRegionMap implements RegionMap { cbEventInPending = true; } } - if (!clearOccured) { + if (!clearOccurred) { lruEntryDestroy(re); } if (owner.concurrencyChecksEnabled && txEntryState != null && cbEvent != null) { @@ -1856,7 +1856,7 @@ public abstract class AbstractRegionMap implements RegionMap { } boolean didInvalidate = false; RegionEntry invalidatedRe = null; - boolean clearOccured = false; + boolean clearOccurred = false; DiskRegion dr = owner.getDiskRegion(); boolean ownerIsInitialized = owner.isInitialized(); try { @@ -1966,11 +1966,11 @@ public abstract class AbstractRegionMap implements RegionMap { // generate versionTag for the event EntryLogger.logInvalidate(event); owner.recordEvent(event); - clearOccured = true; + clearOccurred = true; } owner.basicInvalidatePart2(oldRe, event, - clearOccured /* conflict with clear */, invokeCallbacks); - if (!clearOccured) { + clearOccurred /* conflict with clear */, invokeCallbacks); + if (!clearOccurred) { if (isCreate) { lruEntryCreate(oldRe); } else { @@ -2011,11 +2011,11 @@ public abstract class AbstractRegionMap implements RegionMap { // TODO: deltaGII: do we even need RegionClearedException? // generate versionTag for the event owner.recordEvent(event); - clearOccured = true; + clearOccurred = true; } - owner.basicInvalidatePart2(newRe, event, clearOccured /* conflict with clear */, + owner.basicInvalidatePart2(newRe, event, clearOccurred /* conflict with clear */, invokeCallbacks); - if (!clearOccured) { + if (!clearOccurred) { lruEntryCreate(newRe); incEntryCount(1); } @@ -2183,7 +2183,7 @@ public abstract class AbstractRegionMap implements RegionMap { // generate versionTag for the event EntryLogger.logInvalidate(event); _getOwner().recordEvent(event); - clearOccured = true; + clearOccurred = true; } catch (ConcurrentCacheModificationException ccme) { VersionTag tag = event.getVersionTag(); if (tag != null && tag.isTimeStampUpdated()) { @@ -2192,9 +2192,9 @@ public abstract class AbstractRegionMap implements RegionMap { } throw ccme; } - owner.basicInvalidatePart2(re, event, clearOccured /* conflict with clear */, + owner.basicInvalidatePart2(re, event, clearOccurred /* conflict with clear */, invokeCallbacks); - if (!clearOccured) { + if (!clearOccurred) { if (oldWasTombstone) { lruEntryCreate(re); } else { @@ -2228,7 +2228,7 @@ public abstract class AbstractRegionMap implements RegionMap { if (invalidatedRe != null) { owner.basicInvalidatePart3(invalidatedRe, event, invokeCallbacks); } - if (didInvalidate && !clearOccured) { + if (didInvalidate && !clearOccurred) { try { lruUpdateCallback(); } catch (DiskAccessException dae) { @@ -2397,7 +2397,7 @@ public abstract class AbstractRegionMap implements RegionMap { } oldRe.setValueResultOfSearch(false); processAndGenerateTXVersionTag(owner, cbEvent, oldRe, txEntryState); - boolean clearOccured = false; + boolean clearOccurred = false; try { oldRe.setValue(owner, oldRe.prepareValueForCache(owner, newValue, true)); EntryLogger.logTXInvalidate(_getOwnerObject(), key); @@ -2406,10 +2406,10 @@ public abstract class AbstractRegionMap implements RegionMap { owner.unscheduleTombstone(oldRe); } } catch (RegionClearedException rce) { - clearOccured = true; + clearOccurred = true; } owner.txApplyInvalidatePart2(oldRe, oldRe.getKey(), didDestroy, true, - clearOccured); + clearOccurred); // didInvalidate = true; if (invokeCallbacks) { switchEventOwnerAndOriginRemote(cbEvent, hasRemoteOrigin); @@ -2421,7 +2421,7 @@ public abstract class AbstractRegionMap implements RegionMap { cbEventInPending = true; } } - if (!clearOccured) { + if (!clearOccurred) { lruEntryUpdate(oldRe); } if (shouldPerformConcurrencyChecks(owner, cbEvent) && txEntryState != null) { @@ -2445,7 +2445,7 @@ public abstract class AbstractRegionMap implements RegionMap { cbEvent.setRegionEntry(newRe); txRemoveOldIndexEntry(Operation.INVALIDATE, newRe); newRe.setValueResultOfSearch(false); - boolean clearOccured = false; + boolean clearOccurred = false; try { processAndGenerateTXVersionTag(owner, cbEvent, newRe, txEntryState); newRe.setValue(owner, newRe.prepareValueForCache(owner, newValue, true)); @@ -2453,9 +2453,10 @@ public abstract class AbstractRegionMap implements RegionMap { owner.updateSizeOnCreate(newRe.getKey(), 0);// we are putting in a new invalidated // entry } catch (RegionClearedException rce) { - clearOccured = true; + clearOccurred = true; } - owner.txApplyInvalidatePart2(newRe, newRe.getKey(), didDestroy, true, clearOccured); + owner.txApplyInvalidatePart2(newRe, newRe.getKey(), didDestroy, true, + clearOccurred); if (invokeCallbacks) { switchEventOwnerAndOriginRemote(cbEvent, hasRemoteOrigin); @@ -2468,7 +2469,7 @@ public abstract class AbstractRegionMap implements RegionMap { } } opCompleted = true; - if (!clearOccured) { + if (!clearOccurred) { lruEntryCreate(newRe); incEntryCount(1); } @@ -2516,7 +2517,7 @@ public abstract class AbstractRegionMap implements RegionMap { } re.setValueResultOfSearch(false); processAndGenerateTXVersionTag(owner, cbEvent, re, txEntryState); - boolean clearOccured = false; + boolean clearOccurred = false; try { re.setValue(owner, re.prepareValueForCache(owner, newValue, true)); EntryLogger.logTXInvalidate(_getOwnerObject(), key); @@ -2525,9 +2526,9 @@ public abstract class AbstractRegionMap implements RegionMap { } owner.updateSizeOnPut(key, oldSize, 0); } catch (RegionClearedException rce) { - clearOccured = true; + clearOccurred = true; } - owner.txApplyInvalidatePart2(re, re.getKey(), didDestroy, true, clearOccured); + owner.txApplyInvalidatePart2(re, re.getKey(), didDestroy, true, clearOccurred); // didInvalidate = true; if (invokeCallbacks) { switchEventOwnerAndOriginRemote(cbEvent, hasRemoteOrigin); @@ -2539,7 +2540,7 @@ public abstract class AbstractRegionMap implements RegionMap { cbEventInPending = true; } } - if (!clearOccured) { + if (!clearOccurred) { lruEntryUpdate(re); } if (shouldPerformConcurrencyChecks(owner, cbEvent) && txEntryState != null) { @@ -2645,7 +2646,7 @@ public abstract class AbstractRegionMap implements RegionMap { boolean requireOldValue, final boolean overwriteDestroyed) throws CacheWriterException, TimeoutException { final LocalRegion owner = _getOwner(); - boolean clearOccured = false; + boolean clearOccurred = false; if (owner == null) { // "fix" for bug 32440 Assert.assertTrue(false, "The owner for RegionMap " + this + " is null for event " + event); @@ -2784,7 +2785,7 @@ public abstract class AbstractRegionMap implements RegionMap { owner.recordEvent(event); eventRecorded = true; } catch (RegionClearedException rce) { - clearOccured = true; + clearOccurred = true; owner.recordEvent(event); } catch (ConcurrentCacheModificationException ccme) { VersionTag tag = event.getVersionTag(); @@ -2797,10 +2798,10 @@ public abstract class AbstractRegionMap implements RegionMap { if (uninitialized) { event.inhibitCacheListenerNotification(true); } - updateLru(clearOccured, re, event); + updateLru(clearOccurred, re, event); lastModifiedTime = owner.basicPutPart2(event, re, !uninitialized, - lastModifiedTime, clearOccured); + lastModifiedTime, clearOccurred); } finally { notifyIndex(re, false); } @@ -2837,7 +2838,7 @@ public abstract class AbstractRegionMap implements RegionMap { } finally { // bug 32589, post update may throw an exception if exception occurs // for any recipients - if (!clearOccured) { + if (!clearOccurred) { try { lruUpdateCallback(); } catch (DiskAccessException dae) { @@ -2958,8 +2959,8 @@ public abstract class AbstractRegionMap implements RegionMap { updateSize(event, oldSize, true/* isUpdate */, wasTombstone); } - private void updateLru(boolean clearOccured, RegionEntry re, EntryEventImpl event) { - if (!clearOccured) { + private void updateLru(boolean clearOccurred, RegionEntry re, EntryEventImpl event) { + if (!clearOccurred) { if (event.getOperation().isCreate()) { lruEntryCreate(re); } else { @@ -3136,7 +3137,7 @@ public abstract class AbstractRegionMap implements RegionMap { cbEvent.setOldValue(re.getValueInVM(owner)); // OFFHEAP eei } - boolean clearOccured = false; + boolean clearOccurred = false; // Set RegionEntry updateInProgress if (owner.indexMaintenanceSynchronous) { re.setUpdateInProgress(true); @@ -3169,14 +3170,14 @@ public abstract class AbstractRegionMap implements RegionMap { } } } catch (RegionClearedException rce) { - clearOccured = true; + clearOccurred = true; } { long lastMod = owner.cacheTimeMillis(); EntryLogger.logTXPut(_getOwnerObject(), key, nv); re.updateStatsForPut(lastMod, lastMod); owner.txApplyPutPart2(re, re.getKey(), newValue, lastMod, false, didDestroy, - clearOccured); + clearOccurred); } } finally { if (re != null && owner.indexMaintenanceSynchronous) { @@ -3194,7 +3195,7 @@ public abstract class AbstractRegionMap implements RegionMap { cbEventInPending = true; } } - if (!clearOccured) { + if (!clearOccurred) { lruEntryUpdate(re); } } @@ -3231,7 +3232,7 @@ public abstract class AbstractRegionMap implements RegionMap { cbEvent.setRegionEntry(oldRe); cbEvent.setOldValue(oldRe.getValueInVM(owner)); // OFFHEAP eei } - boolean clearOccured = false; + boolean clearOccurred = false; // Set RegionEntry updateInProgress if (owner.indexMaintenanceSynchronous) { oldRe.setUpdateInProgress(true); @@ -3269,14 +3270,14 @@ public abstract class AbstractRegionMap implements RegionMap { } } } catch (RegionClearedException rce) { - clearOccured = true; + clearOccurred = true; } { long lastMod = owner.cacheTimeMillis(); EntryLogger.logTXPut(_getOwnerObject(), key, nv); oldRe.updateStatsForPut(lastMod, lastMod); owner.txApplyPutPart2(oldRe, oldRe.getKey(), newValue, lastMod, false, - didDestroy, clearOccured); + didDestroy, clearOccurred); } } finally { if (oldRe != null && owner.indexMaintenanceSynchronous) { @@ -3298,7 +3299,7 @@ public abstract class AbstractRegionMap implements RegionMap { cbEventInPending = true; } } - if (!clearOccured) { + if (!clearOccurred) { lruEntryUpdate(oldRe); } } @@ -3310,7 +3311,7 @@ public abstract class AbstractRegionMap implements RegionMap { cbEvent.setRegionEntry(newRe); cbEvent.setOldValue(null); } - boolean clearOccured = false; + boolean clearOccurred = false; // Set RegionEntry updateInProgress if (owner.indexMaintenanceSynchronous) { newRe.setUpdateInProgress(true); @@ -3335,14 +3336,14 @@ public abstract class AbstractRegionMap implements RegionMap { owner.updateSizeOnCreate(newRe.getKey(), owner.calculateRegionEntryValueSize(newRe)); } catch (RegionClearedException rce) { - clearOccured = true; + clearOccurred = true; } { long lastMod = owner.cacheTimeMillis(); EntryLogger.logTXPut(_getOwnerObject(), key, nv); newRe.updateStatsForPut(lastMod, lastMod); owner.txApplyPutPart2(newRe, newRe.getKey(), newValue, lastMod, true, didDestroy, - clearOccured); + clearOccurred); } } finally { if (newRe != null && owner.indexMaintenanceSynchronous) { @@ -3362,7 +3363,7 @@ public abstract class AbstractRegionMap implements RegionMap { cbEventInPending = true; } } - if (!clearOccured) { + if (!clearOccurred) { lruEntryCreate(newRe); incEntryCount(1); } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java index bbff29c..d1609ca 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java @@ -3409,7 +3409,7 @@ public class DiskStoreImpl implements DiskStore { // log the error final StringId sid = - LocalizedStrings.LocalRegion_A_DISKACCESSEXCEPTION_HAS_OCCURED_WHILE_WRITING_TO_THE_DISK_FOR_DISKSTORE_0_THE_CACHE_WILL_BE_CLOSED; + LocalizedStrings.LocalRegion_A_DISKACCESSEXCEPTION_HAS_OCCURRED_WHILE_WRITING_TO_THE_DISK_FOR_DISKSTORE_0_THE_CACHE_WILL_BE_CLOSED; logger.error(LocalizedMessage.create(sid, DiskStoreImpl.this.getName()), dae); final ThreadGroup exceptionHandlingGroup = @@ -3424,7 +3424,7 @@ public class DiskStoreImpl implements DiskStore { } catch (Exception e) { logger.error(LocalizedMessage.create( - LocalizedStrings.LocalRegion_AN_EXCEPTION_OCCURED_WHILE_CLOSING_THE_CACHE), e); + LocalizedStrings.LocalRegion_AN_EXCEPTION_OCCURRED_WHILE_CLOSING_THE_CACHE), e); } } }; http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java index c3a4961..839cc98 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java @@ -3900,20 +3900,20 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA stats.endFunctionExecution(start, function.hasResult()); } catch (FunctionException functionException) { if (logger.isDebugEnabled()) { - logger.debug("FunctionException occured on remote node while executing Function: {}", + logger.debug("FunctionException occurred on remote node while executing Function: {}", function.getId(), functionException); } stats.endFunctionExecutionWithException(function.hasResult()); throw functionException; } catch (CacheClosedException cacheClosedexception) { if (logger.isDebugEnabled()) { - logger.debug("CacheClosedException occured on remote node while executing Function: {}", + logger.debug("CacheClosedException occurred on remote node while executing Function: {}", function.getId(), cacheClosedexception); } throw cacheClosedexception; } catch (Exception exception) { if (logger.isDebugEnabled()) { - logger.debug("Exception occured on remote node while executing Function: {}", + logger.debug("Exception occurred on remote node while executing Function: {}", function.getId(), exception); } stats.endFunctionExecutionWithException(function.hasResult()); http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java index 1de8d3b..dacf8f5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage.java @@ -178,7 +178,7 @@ public class DistributedRegionFunctionStreamingMessage extends DistributionMessa // now, so don't let this thread continue. throw err; } catch (Throwable t) { - logger.debug("{} exception occured while processing message: {}", this, t.getMessage(), t); + logger.debug("{} exception occurred while processing message: {}", this, t.getMessage(), t); // Whenever you catch Error or Throwable, you must also // catch VirtualMachineError (see above). However, there is // _still_ a possibility that you are dealing with a cascading http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java index b634b66..84e734c 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java @@ -1031,7 +1031,7 @@ public class GemFireCacheImpl ClusterConfigurationLoader.deployJarsReceivedFromClusterConfiguration(this, response); } catch (IOException | ClassNotFoundException e) { throw new GemFireConfigException( - LocalizedStrings.GemFireCache_EXCEPTION_OCCURED_WHILE_DEPLOYING_JARS_FROM_SHARED_CONDFIGURATION + LocalizedStrings.GemFireCache_EXCEPTION_OCCURRED_WHILE_DEPLOYING_JARS_FROM_SHARED_CONDFIGURATION .toLocalizedString(), e); } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java index cdba7e4..81d97b4 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java @@ -6866,7 +6866,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory, // log the error StringId sid = - LocalizedStrings.LocalRegion_A_DISKACCESSEXCEPTION_HAS_OCCURED_WHILE_WRITING_TO_THE_DISK_FOR_REGION_0_THE_CACHE_WILL_BE_CLOSED; + LocalizedStrings.LocalRegion_A_DISKACCESSEXCEPTION_HAS_OCCURRED_WHILE_WRITING_TO_THE_DISK_FOR_REGION_0_THE_CACHE_WILL_BE_CLOSED; logger.error(LocalizedMessage.create(sid, this.fullPath), dae); // forward the error to the disk store @@ -9447,7 +9447,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory, // Asif : Create an anonymous inner class of CacheRuntimeException so // that a RuntimeException is thrown throw new CacheRuntimeException( - LocalizedStrings.LocalRegion_EXCEPTION_OCCURED_WHILE_RE_CREATING_INDEX_DATA_ON_CLEARED_REGION + LocalizedStrings.LocalRegion_EXCEPTION_OCCURRED_WHILE_RE_CREATING_INDEX_DATA_ON_CLEARED_REGION .toLocalizedString(), qe) { private static final long serialVersionUID = 0L; http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java index d0dd084..d4e7f2a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/MemberFunctionStreamingMessage.java @@ -197,7 +197,7 @@ public class MemberFunctionStreamingMessage extends DistributionMessage stats.endFunctionExecution(start, this.functionObject.hasResult()); } catch (FunctionException functionException) { if (logger.isDebugEnabled()) { - logger.debug("FunctionException occured on remote member while executing Function: {}", + logger.debug("FunctionException occurred on remote member while executing Function: {}", this.functionObject.getId(), functionException); } stats.endFunctionExecutionWithException(this.functionObject.hasResult()); @@ -214,7 +214,7 @@ public class MemberFunctionStreamingMessage extends DistributionMessage replyWithException(dm, rex); } catch (Exception exception) { if (logger.isDebugEnabled()) { - logger.debug("Exception occured on remote member while executing Function: {}", + logger.debug("Exception occurred on remote member while executing Function: {}", this.functionObject.getId(), exception); } stats.endFunctionExecutionWithException(this.functionObject.hasResult()); http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java index 7f84393..f21d195 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java @@ -3561,7 +3561,7 @@ public final class Oplog implements CompactableOplog, Flushable { getOplogSet().getChild().create(region, entry, value, async); } else { DiskId did = entry.getDiskId(); - boolean exceptionOccured = false; + boolean exceptionOccurred = false; byte prevUsrBit = did.getUserBits(); int len = did.getValueLength(); try { @@ -3580,20 +3580,20 @@ public final class Oplog implements CompactableOplog, Flushable { } basicCreate(region.getDiskRegion(), entry, value, userBits, async); } catch (IOException ex) { - exceptionOccured = true; + exceptionOccurred = true; region.getCancelCriterion().checkCancelInProgress(ex); throw new DiskAccessException(LocalizedStrings.Oplog_FAILED_WRITING_KEY_TO_0 .toLocalizedString(this.diskFile.getPath()), ex, region.getFullPath()); } catch (InterruptedException ie) { Thread.currentThread().interrupt(); - exceptionOccured = true; + exceptionOccurred = true; region.getCancelCriterion().checkCancelInProgress(ie); throw new DiskAccessException( LocalizedStrings.Oplog_FAILED_WRITING_KEY_TO_0_DUE_TO_FAILURE_IN_ACQUIRING_READ_LOCK_FOR_ASYNCH_WRITING .toLocalizedString(this.diskFile.getPath()), ie, region.getFullPath()); } finally { - if (exceptionOccured) { + if (exceptionOccurred) { did.setValueLength(len); did.setUserBits(prevUsrBit); } @@ -4487,7 +4487,7 @@ public final class Oplog implements CompactableOplog, Flushable { getOplogSet().getChild().modify(region, entry, value, async); } else { DiskId did = entry.getDiskId(); - boolean exceptionOccured = false; + boolean exceptionOccurred = false; byte prevUsrBit = did.getUserBits(); int len = did.getValueLength(); try { @@ -4504,20 +4504,20 @@ public final class Oplog implements CompactableOplog, Flushable { } basicModify(region.getDiskRegion(), entry, value, userBits, async, false); } catch (IOException ex) { - exceptionOccured = true; + exceptionOccurred = true; region.getCancelCriterion().checkCancelInProgress(ex); throw new DiskAccessException(LocalizedStrings.Oplog_FAILED_WRITING_KEY_TO_0 .toLocalizedString(this.diskFile.getPath()), ex, region.getFullPath()); } catch (InterruptedException ie) { Thread.currentThread().interrupt(); - exceptionOccured = true; + exceptionOccurred = true; region.getCancelCriterion().checkCancelInProgress(ie); throw new DiskAccessException( LocalizedStrings.Oplog_FAILED_WRITING_KEY_TO_0_DUE_TO_FAILURE_IN_ACQUIRING_READ_LOCK_FOR_ASYNCH_WRITING .toLocalizedString(this.diskFile.getPath()), ie, region.getFullPath()); } finally { - if (exceptionOccured) { + if (exceptionOccurred) { did.setValueLength(len); did.setUserBits(prevUsrBit); } @@ -4606,7 +4606,7 @@ public final class Oplog implements CompactableOplog, Flushable { getOplogSet().getChild().copyForwardModifyForCompact(dr, entry, wrapper); } else { DiskId did = entry.getDiskId(); - boolean exceptionOccured = false; + boolean exceptionOccurred = false; int len = did.getValueLength(); try { // TODO: compaction needs to get version? @@ -4622,12 +4622,12 @@ public final class Oplog implements CompactableOplog, Flushable { // will be grouped. This is not a true async write; just a grouped one. basicModify(dr, entry, vw, userBits, true, true); } catch (IOException ex) { - exceptionOccured = true; + exceptionOccurred = true; getParent().getCancelCriterion().checkCancelInProgress(ex); throw new DiskAccessException(LocalizedStrings.Oplog_FAILED_WRITING_KEY_TO_0 .toLocalizedString(this.diskFile.getPath()), ex, getParent()); } catch (InterruptedException ie) { - exceptionOccured = true; + exceptionOccurred = true; Thread.currentThread().interrupt(); getParent().getCancelCriterion().checkCancelInProgress(ie); throw new DiskAccessException( @@ -4638,7 +4638,7 @@ public final class Oplog implements CompactableOplog, Flushable { if (wrapper.getOffHeapData() != null) { wrapper.setOffHeapData(null, (byte) 0); } - if (exceptionOccured) { + if (exceptionOccurred) { did.setValueLength(len); } } @@ -4964,26 +4964,26 @@ public final class Oplog implements CompactableOplog, Flushable { getOplogSet().getChild().remove(region, entry, async, isClear); } else { DiskId did = entry.getDiskId(); - boolean exceptionOccured = false; + boolean exceptionOccurred = false; byte prevUsrBit = did.getUserBits(); int len = did.getValueLength(); try { basicRemove(dr, entry, async, isClear); } catch (IOException ex) { - exceptionOccured = true; + exceptionOccurred = true; getParent().getCancelCriterion().checkCancelInProgress(ex); throw new DiskAccessException(LocalizedStrings.Oplog_FAILED_WRITING_KEY_TO_0 .toLocalizedString(this.diskFile.getPath()), ex, dr.getName()); } catch (InterruptedException ie) { Thread.currentThread().interrupt(); region.getCancelCriterion().checkCancelInProgress(ie); - exceptionOccured = true; + exceptionOccurred = true; throw new DiskAccessException( LocalizedStrings.Oplog_FAILED_WRITING_KEY_TO_0_DUE_TO_FAILURE_IN_ACQUIRING_READ_LOCK_FOR_ASYNCH_WRITING .toLocalizedString(this.diskFile.getPath()), ie, dr.getName()); } finally { - if (exceptionOccured) { + if (exceptionOccurred) { did.setValueLength(len); did.setUserBits(prevUsrBit); } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java index 6df3971..70d4e2c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PRQueryProcessor.java @@ -584,7 +584,7 @@ public class PRQueryProcessor { return _ex; } - public boolean exceptionOccured() { + public boolean exceptionOccurred() { return _ex != null; } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java index c6c8f8b..7d0e7bb 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java @@ -816,7 +816,7 @@ public class PartitionedRegion extends LocalRegion Object[] prms = new Object[] {this.getFullPath(), colocatedWith, config.getColocatedWith()}; DiskAccessException dae = new DiskAccessException( - LocalizedStrings.LocalRegion_A_DISKACCESSEXCEPTION_HAS_OCCURED_WHILE_WRITING_TO_THE_DISK_FOR_REGION_0_THE_REGION_WILL_BE_CLOSED + LocalizedStrings.LocalRegion_A_DISKACCESSEXCEPTION_HAS_OCCURRED_WHILE_WRITING_TO_THE_DISK_FOR_REGION_0_THE_REGION_WILL_BE_CLOSED .toLocalizedString(this.getFullPath()), null, dsi); dsi.handleDiskAccessException(dae); @@ -1794,7 +1794,7 @@ public class PartitionedRegion extends LocalRegion throw e; } catch (QueryException qe) { throw new QueryInvocationTargetException( - LocalizedStrings.PartitionedRegion_UNEXPECTED_QUERY_EXCEPTION_OCCURED_DURING_QUERY_EXECUTION_0 + LocalizedStrings.PartitionedRegion_UNEXPECTED_QUERY_EXCEPTION_OCCURRED_DURING_QUERY_EXECUTION_0 .toLocalizedString(qe.getMessage()), qe); } finally { http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java index 5ddf0cb..bc51650 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegionDataStore.java @@ -2957,7 +2957,7 @@ public class PartitionedRegionDataStore implements HasCachePerfStats { stats.endFunctionExecution(start, function.hasResult()); } catch (FunctionException functionException) { if (logger.isDebugEnabled()) { - logger.debug("FunctionException occured on remote node while executing Function: {}", + logger.debug("FunctionException occurred on remote node while executing Function: {}", function.getId(), functionException); } stats.endFunctionExecutionWithException(function.hasResult()); http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java index 9946f26..097ca41 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PlaceHolderDiskRegion.java @@ -174,7 +174,7 @@ public class PlaceHolderDiskRegion extends AbstractDiskRegion implements DiskRec public void handleDiskAccessException(DiskAccessException dae) { getDiskStore().getCache().getLoggerI18n().error( - LocalizedStrings.PlaceHolderDiskRegion_A_DISKACCESSEXCEPTION_HAS_OCCURED_WHILE_RECOVERING_FROM_DISK, + LocalizedStrings.PlaceHolderDiskRegion_A_DISKACCESSEXCEPTION_HAS_OCCURRED_WHILE_RECOVERING_FROM_DISK, getName(), dae); } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java index 8ed07f8..c4bf506 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ProxyRegionMap.java @@ -161,7 +161,7 @@ final class ProxyRegionMap implements RegionMap { } owner.recordEvent(event); this.owner.basicDestroyPart2(markerEntry, event, inTokenMode, - false /* Clear conflict occured */, duringRI, true); + false /* Clear conflict occurred */, duringRI, true); this.owner.basicDestroyPart3(markerEntry, event, inTokenMode, duringRI, true, expectedOldValue); return true; } @@ -246,7 +246,7 @@ final class ProxyRegionMap implements RegionMap { ClientProxyMembershipID bridgeContext, boolean isOriginRemote, TXEntryState txEntryState, VersionTag versionTag, long tailKey) { this.owner.txApplyDestroyPart2(markerEntry, key, inTokenMode, - false /* Clear conflict occured */); + false /* Clear conflict occurred */); if (!inTokenMode) { if (txEvent != null) { txEvent.addDestroy(this.owner, markerEntry, key, aCallbackArgument); @@ -281,7 +281,7 @@ final class ProxyRegionMap implements RegionMap { ClientProxyMembershipID bridgeContext, TXEntryState txEntryState, VersionTag versionTag, long tailKey) { this.owner.txApplyInvalidatePart2(markerEntry, key, didDestroy, true, - false /* Clear conflic occured */); + false /* Clear conflic occurred */); if (this.owner.isInitialized()) { if (txEvent != null) { txEvent.addInvalidate(this.owner, markerEntry, key, newValue, aCallbackArgument); @@ -319,7 +319,7 @@ final class ProxyRegionMap implements RegionMap { Operation putOp = p_putOp.getCorrespondingCreateOp(); long lastMod = owner.cacheTimeMillis(); this.owner.txApplyPutPart2(markerEntry, key, newValue, lastMod, true, didDestroy, - false /* Clear conflict occured */); + false /* Clear conflict occurred */); if (this.owner.isInitialized()) { if (txEvent != null) { txEvent.addPut(putOp, this.owner, markerEntry, key, newValue, aCallbackArgument); http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java index f82f0ce..4a48fee 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/UpdateEntryVersionOperation.java @@ -135,7 +135,7 @@ public class UpdateEntryVersionOperation extends DistributedCacheOperation { } catch (ConcurrentCacheModificationException e) { if (logger.isTraceEnabled()) { logger.trace( - "UpdateEntryVersionMessage.operationOnRegion; ConcurrentCacheModificationException occured for key={}", + "UpdateEntryVersionMessage.operationOnRegion; ConcurrentCacheModificationException occurred for key={}", ev.getKey()); } return true; // concurrent modification problems are not reported to senders http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java index 7578f15..a1d81d8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/HeapMemoryMonitor.java @@ -710,7 +710,7 @@ public class HeapMemoryMonitor implements NotificationListener, MemoryMonitor { // is still usable: SystemFailure.checkFailure(); this.cache.getLoggerI18n() - .error(LocalizedStrings.MemoryMonitor_EXCEPTION_OCCURED_WHEN_NOTIFYING_LISTENERS, t); + .error(LocalizedStrings.MemoryMonitor_EXCEPTION_OCCURRED_WHEN_NOTIFYING_LISTENERS, t); } } } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java index c9fe6b6..eeaee7f 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/control/OffHeapMemoryMonitor.java @@ -485,7 +485,7 @@ public class OffHeapMemoryMonitor implements MemoryMonitor, MemoryUsageListener // ignore } catch (Throwable t) { logger.error(LocalizedMessage - .create(LocalizedStrings.MemoryMonitor_EXCEPTION_OCCURED_WHEN_NOTIFYING_LISTENERS), t); + .create(LocalizedStrings.MemoryMonitor_EXCEPTION_OCCURRED_WHEN_NOTIFYING_LISTENERS), t); } } } http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java index 505dfce..f09a378 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/AbstractExecution.java @@ -568,7 +568,7 @@ public abstract class AbstractExecution implements InternalExecution { FunctionStats stats = FunctionStats.getFunctionStats(fn.getId(), dm.getSystem()); if (logger.isDebugEnabled()) { - logger.debug("Exception occured on local node while executing Function: {}", fn.getId(), + logger.debug("Exception occurred on local node while executing Function: {}", fn.getId(), functionException); } stats.endFunctionExecutionWithException(fn.hasResult()); http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java index 09a9122..40aa37b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionServiceStats.java @@ -73,7 +73,7 @@ public class FunctionServiceStats { "functionExecutionsHasResultRunning"; /** - * Total number of Exceptions Occuredwhile executing function Name of the functionExecution + * Total number of Exceptions Occurredwhile executing function Name of the functionExecution * exceptions statistic */ private static final String FUNCTION_EXECUTION_EXCEPTIONS = "functionExecutionsExceptions"; @@ -148,7 +148,7 @@ public class FunctionServiceStats { "A gauge indicating the number of currently active execute() calls for functions where hasResult() returns true.", "operations"), f.createIntCounter(FUNCTION_EXECUTION_EXCEPTIONS, - "Total number of Exceptions Occured while executing function", "operations"), + "Total number of Exceptions Occurred while executing function", "operations"), }); // Initialize id fields @@ -318,7 +318,7 @@ public class FunctionServiceStats { } /** - * Returns the current value of the "Total number of Exceptions Occured while executing function" + * Returns the current value of the "Total number of Exceptions Occurred while executing function" * stat. * * @return the current value of the "functionExecutionHasResultRunning" stat http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java index 2f04034..590c93a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/FunctionStats.java @@ -79,7 +79,7 @@ public class FunctionStats { private static final String RESULTS_RECEIVED = "resultsReceived"; /** - * Total number of Exceptions Occured while executing function Name of the functionExecution + * Total number of Exceptions Occurred while executing function Name of the functionExecution * exceptions statistic */ private static final String FUNCTION_EXECUTION_EXCEPTIONS = "functionExecutionsExceptions"; @@ -168,7 +168,7 @@ public class FunctionStats { "operations"), f.createIntCounter(FUNCTION_EXECUTION_EXCEPTIONS, - "Total number of Exceptions Occured while executing function", "operations"), + "Total number of Exceptions Occurred while executing function", "operations"), // f // .createLongCounter( @@ -359,7 +359,7 @@ public class FunctionStats { } /** - * Returns the current value of the "Total number of Exceptions Occured while executing function" + * Returns the current value of the "Total number of Exceptions Occurred while executing function" * stat. * * @return the current value of the "functionExecutionHasResultRunning" stat http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java index 6b2177a..2ea8b61 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerToClientFunctionResultSender.java @@ -308,7 +308,7 @@ public class ServerToClientFunctionResultSender implements ResultSender { sendHeader(); } String exceptionMessage = exception.getMessage() != null ? exception.getMessage() - : "Exception occured during function execution"; + : "Exception occurred during function execution"; logger.warn(LocalizedMessage.create( LocalizedStrings.ExecuteRegionFunction_EXCEPTION_ON_SERVER_WHILE_EXECUTIONG_FUNCTION_0, this.fn), exception); http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java index 7ee5a8d..538df2c 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ha/HARegionQueue.java @@ -1353,7 +1353,7 @@ public class HARegionQueue implements RegionQueue { // ignore and log logger.error( LocalizedMessage.create( - LocalizedStrings.HARegionQueue_EXCEPTION_OCCURED_WHILE_TRYING_TO_SET_THE_LAST_DISPATCHED_ID), + LocalizedStrings.HARegionQueue_EXCEPTION_OCCURRED_WHILE_TRYING_TO_SET_THE_LAST_DISPATCHED_ID), e); } } @@ -2807,7 +2807,7 @@ public class HARegionQueue implements RegionQueue { } logger.warn( LocalizedMessage.create( - LocalizedStrings.HARegionQueue_INTERRUPTEDEXCEPTION_OCCURED_IN_QUEUEREMOVALTHREAD_WHILE_WAITING), + LocalizedStrings.HARegionQueue_INTERRUPTEDEXCEPTION_OCCURRED_IN_QUEUEREMOVALTHREAD_WHILE_WAITING), e); break; // desperation...we must be trying to shut down...? } finally { http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java index 18f13f8..19a7a32 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java @@ -2477,7 +2477,7 @@ public class CacheClientProxy implements ClientSession { */ @Override public void run() { - boolean exceptionOccured = false; + boolean exceptionOccurred = false; this._isStopped = false; if (logger.isDebugEnabled()) { @@ -2597,7 +2597,7 @@ public class CacheClientProxy implements ClientSession { pauseOrUnregisterProxy(e); } // _isStopped } // synchronized - exceptionOccured = true; + exceptionOccurred = true; } // IOException catch (InterruptedException e) { // If the thread is paused, ignore the InterruptedException and @@ -2621,16 +2621,16 @@ public class CacheClientProxy implements ClientSession { if (logger.isDebugEnabled()) { logger.debug("{}: shutting down due to cancellation", this); } - exceptionOccured = true; // message queue is defunct, don't try to read it. + exceptionOccurred = true; // message queue is defunct, don't try to read it. break; } catch (RegionDestroyedException e) { if (logger.isDebugEnabled()) { logger.debug("{}: shutting down due to loss of message queue", this); } - exceptionOccured = true; // message queue is defunct, don't try to read it. + exceptionOccurred = true; // message queue is defunct, don't try to read it. break; } catch (Exception e) { - // An exception occured while processing a message. Since it + // An exception occurred while processing a message. Since it // is not an IOException, the client may still be alive, so // continue processing. if (!isStopped()) { @@ -2644,7 +2644,7 @@ public class CacheClientProxy implements ClientSession { // Processing gets here if isStopped=true. What is this code below doing? List list = null; - if (!exceptionOccured) { + if (!exceptionOccurred) { try { // Clear the interrupt status if any, Thread.interrupted(); http://git-wip-us.apache.org/repos/asf/geode/blob/05d80689/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java index 2ccca76..8885a99 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/command/GatewayReceiverCommand.java @@ -859,7 +859,7 @@ public class GatewayReceiverCommand extends BaseCommand { // errorMsg.addStringPart(be.toString()); errorMsg.send(servConn); for (Exception e : exceptions) { - ((GatewayReceiverStats) servConn.getCacheServerStats()).incExceptionsOccured(); + ((GatewayReceiverStats) servConn.getCacheServerStats()).incExceptionsOccurred(); } for (Exception be : exceptions) { if (logger.isWarnEnabled()) {