Skip to content

Commit 3ef6c6b

Browse files
committed
Javadoc: Normalize spelling
1 parent ab03c74 commit 3ef6c6b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/java/org/apache/commons/pool3/impl/EvictionTimer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* <p>
3434
* This class is currently implemented using {@link ScheduledThreadPoolExecutor}. This implementation may change in any
3535
* future release. This class keeps track of how many pools are using it. If no pools are using the timer, it is
36-
* cancelled. This prevents a thread being left running which, in application server environments, can lead to memory
36+
* canceled. This prevents a thread being left running which, in application server environments, can lead to memory
3737
* leads and/or prevent applications from shutting down or reloading cleanly.
3838
* </p>
3939
* <p>
@@ -139,7 +139,7 @@ public void run() {
139139
/**
140140
* Removes the specified eviction task from the timer.
141141
*
142-
* @param evictor Task to be cancelled.
142+
* @param evictor Task to be canceled.
143143
* @param timeout If the associated executor is no longer required, how
144144
* long should this thread wait for the executor to
145145
* terminate?

src/test/java/org/apache/commons/pool3/impl/TestEvictionTimer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public PooledObject<String> wrap(final String obj) {
8484
EvictionTimer.cancel(evictor1, BaseObjectPoolConfig.DEFAULT_EVICTOR_SHUTDOWN_TIMEOUT, false);
8585

8686
// Assert that eviction objects are correctly cleaned
87-
// 1 - the evictor timer task is cancelled
87+
// 1 - the evictor timer task is canceled
8888
sf = (ScheduledFuture<?>) evictorTaskFutureField.get(evictor1);
8989
assertTrue(sf.isCancelled());
9090
// 2- and, the eviction action is removed from executor thread pool
@@ -96,7 +96,7 @@ public PooledObject<String> wrap(final String obj) {
9696
EvictionTimer.cancel(evictor2, BaseObjectPoolConfig.DEFAULT_EVICTOR_SHUTDOWN_TIMEOUT, false);
9797

9898
// Assert that eviction objects are correctly cleaned
99-
// 1 - the evictor timer task is cancelled
99+
// 1 - the evictor timer task is canceled
100100
sf = (ScheduledFuture<?>) evictorTaskFutureField.get(evictor2);
101101
assertTrue(sf.isCancelled());
102102
// 2- and, the eviction thread pool executor is freed

0 commit comments

Comments
 (0)