This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
The following commit(s) were added to refs/heads/master by this push:
new 90cab01 Standardize on American English spelling of 'behavior'.
90cab01 is described below
commit 90cab0132bfe519310a856d778f105374a1cca78
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Mar 30 15:31:14 2020 -0400
Standardize on American English spelling of 'behavior'.
---
src/changes/changes.xml | 4 ++--
src/main/java/org/apache/commons/pool2/KeyedObjectPool.java | 2 +-
src/main/java/org/apache/commons/pool2/ObjectPool.java | 2 +-
.../org/apache/commons/pool2/impl/BaseGenericObjectPool.java | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8b0f74a..9c8e76c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -441,7 +441,7 @@ including bugfixes and test case improvements.">
in high concurrency environments. Pools now provide a mechanism for tracking
objects that have been borrowed from the pool but not returned. There have been
numerous API changes to support these and other new features as well as to
-clarify behaviour and improve consistency across the API. This release requires
+clarify behavior and improve consistency across the API. This release requires
JDK level 1.6 or above.">
<action issue="POOL-211" dev="markt" type="add" due-to="Brad Koehn">
Add support for proxy wrappers to ObjectPool and KeyedObjectPool. The
@@ -513,7 +513,7 @@ JDK level 1.6 or above.">
remove deprecated code and unnecessary code.
</action>
<action dev="markt" type="update">
- Introduce an Enum (WhenExhaustedAction) to control pool behaviour when no
+ Introduce an Enum (WhenExhaustedAction) to control pool behavior when no
more objects are available to allocate.
</action>
<action dev="markt" type="update">
diff --git a/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java
b/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java
index edf5ead..9cca6e2 100644
--- a/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java
@@ -156,7 +156,7 @@ public interface KeyedObjectPool<K, V> extends Closeable {
* instance in the first place.
* </p>
* <p>
- * The behaviour of this method when the pool has been exhausted is not
+ * The behavior of this method when the pool has been exhausted is not
* strictly specified (although it may be specified by implementations).
* </p>
*
diff --git a/src/main/java/org/apache/commons/pool2/ObjectPool.java
b/src/main/java/org/apache/commons/pool2/ObjectPool.java
index f8250af..ca998fc 100644
--- a/src/main/java/org/apache/commons/pool2/ObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/ObjectPool.java
@@ -106,7 +106,7 @@ public interface ObjectPool<T> extends Closeable {
* method as defined in an implementation or sub-interface.
* </p>
* <p>
- * The behaviour of this method when the pool has been exhausted
+ * The behavior of this method when the pool has been exhausted
* is not strictly specified (although it may be specified by
* implementations).
* </p>
diff --git
a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
index 9ebdaee..c300f05 100644
--- a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
@@ -281,14 +281,14 @@ public abstract class BaseGenericObjectPool<T> extends
BaseObject {
}
/**
- * Returns whether the pool has LIFO (last in, first out) behaviour with
+ * Returns whether the pool has LIFO (last in, first out) behavior with
* respect to idle objects - always returning the most recently used object
* from the pool, or as a FIFO (first in, first out) queue, where the pool
* always returns the oldest object in the idle object pool.
*
- * @return {@code true} if the pool is configured with LIFO behaviour
+ * @return {@code true} if the pool is configured with LIFO behavior
* or {@code false} if the pool is configured with FIFO
- * behaviour
+ * behavior
*
* @see #setLifo
*/
@@ -308,14 +308,14 @@ public abstract class BaseGenericObjectPool<T> extends
BaseObject {
}
/**
- * Sets whether the pool has LIFO (last in, first out) behaviour with
+ * Sets whether the pool has LIFO (last in, first out) behavior with
* respect to idle objects - always returning the most recently used object
* from the pool, or as a FIFO (first in, first out) queue, where the pool
* always returns the oldest object in the idle object pool.
*
* @param lifo {@code true} if the pool is to be configured with LIFO
- * behaviour or {@code false} if the pool is to be
- * configured with FIFO behaviour
+ * behavior or {@code false} if the pool is to be
+ * configured with FIFO behavior
*
* @see #getLifo()
*/
