You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/04/23 23:36:43 UTC
svn commit: r1096239 -
/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java
Author: simonetripodi
Date: Sat Apr 23 21:36:42 2011
New Revision: 1096239
URL: http://svn.apache.org/viewvc?rev=1096239&view=rev
Log:
removed unnecessary 'else' statements
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java
Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java?rev=1096239&r1=1096238&r2=1096239&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java (original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java Sat Apr 23 21:36:42 2011
@@ -157,10 +157,9 @@ public class StackKeyedObjectPool<K,V> e
} else {
if(null == _factory) {
throw new NoSuchElementException("pools without a factory cannot create new objects as needed.");
- } else {
- obj = _factory.makeObject(key);
- newlyMade = true;
}
+ obj = _factory.makeObject(key);
+ newlyMade = true;
}
if (null != _factory && null != obj) {
try {
@@ -463,10 +462,9 @@ public class StackKeyedObjectPool<K,V> e
public synchronized void setFactory(KeyedPoolableObjectFactory<K,V> factory) throws IllegalStateException {
if(0 < getNumActive()) {
throw new IllegalStateException("Objects are already active");
- } else {
- clear();
- _factory = factory;
}
+ clear();
+ _factory = factory;
}
/**