Author: sebb
Date: Thu Oct 31 00:37:47 2013
New Revision: 1537359
URL: http://svn.apache.org/r1537359
Log:
Avoid data hiding
Modified:
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/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=1537359&r1=1537358&r2=1537359&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
Thu Oct 31 00:37:47 2013
@@ -220,9 +220,9 @@ public class GenericKeyedObjectPool<K,T>
*/
@Override
public int getMinIdlePerKey() {
- int maxIdlePerKey = getMaxIdlePerKey();
- if (this.minIdlePerKey > maxIdlePerKey) {
- return maxIdlePerKey;
+ int maxIdlePerKeySave = getMaxIdlePerKey();
+ if (this.minIdlePerKey > maxIdlePerKeySave) {
+ return maxIdlePerKeySave;
} else {
return minIdlePerKey;
}
@@ -765,7 +765,7 @@ public class GenericKeyedObjectPool<K,T>
* borrowed, returned or destroyed by other threads while it is executing.
*/
private void reuseCapacity() {
- final int maxTotalPerKey = getMaxTotalPerKey();
+ final int maxTotalPerKeySave = getMaxTotalPerKey();
// Find the most loaded pool that could take a new instance
int maxQueueLength = 0;
@@ -776,7 +776,7 @@ public class GenericKeyedObjectPool<K,T>
if (deque != null) {
final LinkedBlockingDeque<PooledObject<T>> pool =
deque.getIdleObjects();
final int queueLength = pool.getTakeQueueLength();
- if (getNumActive(k) < maxTotalPerKey && queueLength >
maxQueueLength) {
+ if (getNumActive(k) < maxTotalPerKeySave && queueLength >
maxQueueLength) {
maxQueueLength = queueLength;
mostLoaded = pool;
loadedKey = k;
@@ -953,7 +953,7 @@ public class GenericKeyedObjectPool<K,T>
* @throws Exception If the objection creation fails
*/
private PooledObject<T> create(K key) throws Exception {
- int maxTotalPerKey = getMaxTotalPerKey(); // Per key
+ int maxTotalPerKeySave = getMaxTotalPerKey(); // Per key
int maxTotal = getMaxTotal(); // All keys
// Check against the overall limit
@@ -977,7 +977,7 @@ public class GenericKeyedObjectPool<K,T>
long newCreateCount = objectDeque.getCreateCount().incrementAndGet();
// Check against the per key limit
- if (maxTotalPerKey > -1 && newCreateCount > maxTotalPerKey ||
+ if (maxTotalPerKeySave > -1 && newCreateCount > maxTotalPerKeySave ||
newCreateCount > Integer.MAX_VALUE) {
numTotal.decrementAndGet();
objectDeque.getCreateCount().decrementAndGet();
@@ -1113,8 +1113,8 @@ public class GenericKeyedObjectPool<K,T>
@Override
void ensureMinIdle() throws Exception {
- int minIdlePerKey = getMinIdlePerKey();
- if (minIdlePerKey < 1) {
+ int minIdlePerKeySave = getMinIdlePerKey();
+ if (minIdlePerKeySave < 1) {
return;
}
@@ -1202,8 +1202,8 @@ public class GenericKeyedObjectPool<K,T>
* @param key - The key to register for pool control.
*/
public void preparePool(K key) throws Exception {
- int minIdlePerKey = getMinIdlePerKey();
- if (minIdlePerKey < 1) {
+ int minIdlePerKeySave = getMinIdlePerKey();
+ if (minIdlePerKeySave < 1) {
return;
}
ensureMinIdle(key);
@@ -1241,16 +1241,16 @@ public class GenericKeyedObjectPool<K,T>
// Used more than once so keep a local copy so the value is consistent
int maxTotal = getMaxTotal();
- int maxTotalPerKey = getMaxTotalPerKey();
+ int maxTotalPerKeySave = getMaxTotalPerKey();
int objectDefecit = 0;
// Calculate no of objects needed to be created, in order to have
// the number of pooled objects < maxTotalPerKey();
objectDefecit = getMinIdlePerKey() -
objectDeque.getIdleObjects().size();
- if (maxTotalPerKey > 0) {
+ if (maxTotalPerKeySave > 0) {
int growLimit = Math.max(0,
- maxTotalPerKey - objectDeque.getIdleObjects().size());
+ maxTotalPerKeySave - objectDeque.getIdleObjects().size());
objectDefecit = Math.min(objectDefecit, growLimit);
}
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=1537359&r1=1537358&r2=1537359&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
Thu Oct 31 00:37:47 2013
@@ -214,9 +214,9 @@ public class GenericObjectPool<T> extend
*/
@Override
public int getMinIdle() {
- int maxIdle = getMaxIdle();
- if (this.minIdle > maxIdle) {
- return maxIdle;
+ int maxIdleSave = getMaxIdle();
+ if (this.minIdle > maxIdleSave) {
+ return maxIdleSave;
} else {
return minIdle;
}
@@ -583,8 +583,8 @@ public class GenericObjectPool<T> extend
"Object has already been retured to this pool or is
invalid");
}
- int maxIdle = getMaxIdle();
- if (isClosed() || maxIdle > -1 && maxIdle <= idleObjects.size()) {
+ int maxIdleSave = getMaxIdle();
+ if (isClosed() || maxIdleSave > -1 && maxIdleSave <=
idleObjects.size()) {
try {
destroy(p);
} catch (Exception e) {
@@ -854,12 +854,12 @@ public class GenericObjectPool<T> extend
@Override
void ensureMinIdle() throws Exception {
- int minIdle = getMinIdle();
- if (minIdle < 1) {
+ int minIdleSave = getMinIdle();
+ if (minIdleSave < 1) {
return;
}
- while (idleObjects.size() < minIdle) {
+ while (idleObjects.size() < minIdleSave) {
PooledObject<T> p = create();
if (p == null) {
// Can't create objects, no reason to think another call to
