Skip to content

Commit

Permalink
Standardize on American English spelling of 'behavior'.
Browse files Browse the repository at this point in the history
  • Loading branch information
garydgregory committed Mar 30, 2020
1 parent ea10d8a commit 90cab01
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/changes/changes.xml
Expand Up @@ -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
Expand Down Expand Up @@ -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">
Expand Down
Expand Up @@ -156,7 +156,7 @@ default void addObjects(final K key, final int count) throws Exception, IllegalA
* 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>
*
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/pool2/ObjectPool.java
Expand Up @@ -106,7 +106,7 @@ default void addObjects(final int count) throws Exception {
* 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>
Expand Down
Expand Up @@ -281,14 +281,14 @@ public final void setMaxWaitMillis(final long maxWaitMillis) {
}

/**
* 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
*/
Expand All @@ -308,14 +308,14 @@ public final boolean getFairness() {
}

/**
* 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()
*/
Expand Down

0 comments on commit 90cab01

Please sign in to comment.