This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch POOL_2_X
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
The following commit(s) were added to refs/heads/POOL_2_X by this push:
new 1979d4ca Flip null test
1979d4ca is described below
commit 1979d4ca4bb6abc3b1a1b865935567793af7bf60
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Jul 5 09:41:22 2026 -0400
Flip null test
---
doc/ReaderUtil.java | 2 +-
.../java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java | 2 +-
.../java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/ReaderUtil.java b/doc/ReaderUtil.java
index c8d0f8a4..f8d5755e 100644
--- a/doc/ReaderUtil.java
+++ b/doc/ReaderUtil.java
@@ -60,7 +60,7 @@ public class ReaderUtil {
// ignored
}
try {
- if (null != buf) {
+ if (buf != null) {
pool.returnObject(buf);
}
} catch (Exception e) {
diff --git
a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
index c1604f30..8efa3a3b 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
@@ -941,7 +941,7 @@ public class GenericKeyedObjectPool<K, T> extends
BaseGenericObjectPool<T>
// Pool may have changed since we released the read lock
// numInterested decrement could lead to removal while waiting
for write lock
objectDeque = poolMap.get(k);
- if (null != objectDeque &&
objectDeque.getNumInterested().get() == 0 && objectDeque.getCreateCount().get()
== 0) {
+ if (objectDeque != null &&
objectDeque.getNumInterested().get() == 0 && objectDeque.getCreateCount().get()
== 0) {
// NOTE: Keys must always be removed from both poolMap and
// poolKeyList at the same time while protected by
// keyLock.writeLock()
diff --git
a/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
b/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
index f5a27cae..472aa62c 100644
--- a/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
@@ -199,7 +199,7 @@ public class SoftReferenceObjectPool<T> extends
BaseObjectPool<T> {
ref.getReference().clear();
ref.setReference(new SoftReference<>(obj));
}
- if (null != factory && null != obj) {
+ if (factory != null && obj != null) {
try {
factory.activateObject(ref);
if (!factory.validateObject(ref)) {
@@ -231,10 +231,10 @@ public class SoftReferenceObjectPool<T> extends
BaseObjectPool<T> {
*/
@Override
public synchronized void clear() {
- if (null != factory) {
+ if (factory != null) {
idleReferences.forEach(ref -> {
try {
- if (null != ref.getObject()) {
+ if (ref.getObject() != null) {
factory.destroyObject(ref);
}
} catch (final Exception ignored) {