This is an automated email from the ASF dual-hosted git repository.
psteitz 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 67926f2e Remove needless try-catch (after removing casted rethrow).
67926f2e is described below
commit 67926f2e6e23c58027293e92228999782569ab5c
Author: psteitz <phil.ste...@gmail.com>
AuthorDate: Fri Jul 21 10:41:23 2023 -0700
Remove needless try-catch (after removing casted rethrow).
---
.../org/apache/commons/pool2/impl/GenericKeyedObjectPool.java | 8 ++------
.../java/org/apache/commons/pool2/impl/GenericObjectPool.java | 7 +------
2 files changed, 3 insertions(+), 12 deletions(-)
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 2ceea0f5..402368d8 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
@@ -448,12 +448,8 @@ public class GenericKeyedObjectPool<K, T> extends
BaseGenericObjectPool<T>
}
if (blockWhenExhausted) {
if (PooledObject.isNull(p)) {
- try {
- p = borrowMaxWaitMillis < 0 ?
objectDeque.getIdleObjects().takeFirst() :
-
objectDeque.getIdleObjects().pollFirst(borrowMaxWaitMillis,
TimeUnit.MILLISECONDS);
- } catch (final InterruptedException e) {
- throw e;
- }
+ p = borrowMaxWaitMillis < 0 ?
objectDeque.getIdleObjects().takeFirst()
+ :
objectDeque.getIdleObjects().pollFirst(borrowMaxWaitMillis,
TimeUnit.MILLISECONDS);
}
if (PooledObject.isNull(p)) {
throw new NoSuchElementException(appendStats(
diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
index b638da77..15ab1586 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
@@ -310,12 +310,7 @@ public class GenericObjectPool<T> extends
BaseGenericObjectPool<T>
}
if (blockWhenExhausted) {
if (PooledObject.isNull(p)) {
- try {
- p = borrowMaxWaitDuration.isNegative() ?
idleObjects.takeFirst() : idleObjects.pollFirst(borrowMaxWaitDuration);
- } catch (final InterruptedException e) {
- // Don't surface exception type of internal locking
mechanism.
- throw e;
- }
+ p = borrowMaxWaitDuration.isNegative() ?
idleObjects.takeFirst() : idleObjects.pollFirst(borrowMaxWaitDuration);
}
if (PooledObject.isNull(p)) {
throw new NoSuchElementException(appendStats(
