Author: markt
Date: Tue Mar 15 20:27:16 2016
New Revision: 1735162
URL: http://svn.apache.org/viewvc?rev=1735162&view=rev
Log:
Small refactoring of borrowObject() to reduce code duplication.
Modified:
commons/proper/pool/trunk/src/changes/changes.xml
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Modified: commons/proper/pool/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/changes/changes.xml?rev=1735162&r1=1735161&r2=1735162&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/changes/changes.xml (original)
+++ commons/proper/pool/trunk/src/changes/changes.xml Tue Mar 15 20:27:16 2016
@@ -56,6 +56,9 @@ The <action> type attribute can be add,u
threads try to borrow an object at the same time and the factory fails to
create any objects.
</action>
+ <action dev="markt" issue="POOL-280" tyoe="update" due-to="Jacopo
Cappellato">
+ Small refactoring of borrowObject() to reduce code duplication.
+ </action>
</release>
<release version="2.4.2" date="2015-08-01" description=
"This is a patch release, including bug fixes only.">
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1735162&r1=1735161&r2=1735162&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
Tue Mar 15 20:27:16 2016
@@ -350,14 +350,14 @@ public class GenericKeyedObjectPool<K,T>
try {
while (p == null) {
create = false;
- if (blockWhenExhausted) {
- p = objectDeque.getIdleObjects().pollFirst();
- if (p == null) {
- p = create(key);
- if (p != null) {
- create = true;
- }
+ p = objectDeque.getIdleObjects().pollFirst();
+ if (p == null) {
+ p = create(key);
+ if (p != null) {
+ create = true;
}
+ }
+ if (blockWhenExhausted) {
if (p == null) {
if (borrowMaxWaitMillis < 0) {
p = objectDeque.getIdleObjects().takeFirst();
@@ -370,23 +370,13 @@ public class GenericKeyedObjectPool<K,T>
throw new NoSuchElementException(
"Timeout waiting for idle object");
}
- if (!p.allocate()) {
- p = null;
- }
} else {
- p = objectDeque.getIdleObjects().pollFirst();
- if (p == null) {
- p = create(key);
- if (p != null) {
- create = true;
- }
- }
if (p == null) {
throw new NoSuchElementException("Pool exhausted");
}
- if (!p.allocate()) {
- p = null;
- }
+ }
+ if (!p.allocate()) {
+ p = null;
}
if (p != null) {
Modified:
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1735162&r1=1735161&r2=1735162&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Tue Mar 15 20:27:16 2016
@@ -428,14 +428,14 @@ public class GenericObjectPool<T> extend
while (p == null) {
create = false;
- if (blockWhenExhausted) {
- p = idleObjects.pollFirst();
- if (p == null) {
- p = create();
- if (p != null) {
- create = true;
- }
+ p = idleObjects.pollFirst();
+ if (p == null) {
+ p = create();
+ if (p != null) {
+ create = true;
}
+ }
+ if (blockWhenExhausted) {
if (p == null) {
if (borrowMaxWaitMillis < 0) {
p = idleObjects.takeFirst();
@@ -448,23 +448,13 @@ public class GenericObjectPool<T> extend
throw new NoSuchElementException(
"Timeout waiting for idle object");
}
- if (!p.allocate()) {
- p = null;
- }
} else {
- p = idleObjects.pollFirst();
- if (p == null) {
- p = create();
- if (p != null) {
- create = true;
- }
- }
if (p == null) {
throw new NoSuchElementException("Pool exhausted");
}
- if (!p.allocate()) {
- p = null;
- }
+ }
+ if (!p.allocate()) {
+ p = null;
}
if (p != null) {
