Author: markt
Date: Thu Jan 10 16:02:48 2013
New Revision: 1431458
URL: http://svn.apache.org/viewvc?rev=1431458&view=rev
Log:
Fix FindBugs warning of possible overflow
Modified:
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/GenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1431458&r1=1431457&r2=1431458&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 Jan 10 16:02:48 2013
@@ -591,7 +591,7 @@ public class GenericObjectPool<T> extend
}
}
synchronized (p) {
- if (p.getState() != PooledObjectState.INVALID) {
+ if (p.getState() != PooledObjectState.INVALID) {
destroy(p);
}
}
@@ -875,7 +875,8 @@ public class GenericObjectPool<T> extend
private void removeAbandoned() {
// Generate a list of abandoned objects to remove
final long now = System.currentTimeMillis();
- final long timeout = now -
(abandonedConfig.getRemoveAbandonedTimeout() * 1000);
+ final long timeout =
+ now - (abandonedConfig.getRemoveAbandonedTimeout() * 1000L);
ArrayList<PooledObject<T>> remove = new ArrayList<PooledObject<T>>();
Iterator<PooledObject<T>> it = allObjects.values().iterator();
while (it.hasNext()) {