commit | daa8a21aaf340ed16f3b41d96646997e207debd0 | [log] [tgz] |
---|---|---|
author | Gary Gregory <garydgregory@gmail.com> | Sun Mar 29 20:15:53 2020 -0400 |
committer | Gary Gregory <garydgregory@gmail.com> | Sun Mar 29 20:15:53 2020 -0400 |
tree | 7a4633fc3008112590cbe9c871f3b38f12759f84 | |
parent | 424109f90759007aef6955eced52f9413489a26d [diff] | |
parent | a9e1bc7f27ed1d25e87588d738a0e3c4884fc5ab [diff] |
Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-pool.git
diff --git a/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java b/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java index d95fc93..a21c7a8 100644 --- a/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java +++ b/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java
@@ -206,9 +206,11 @@ /** * Deallocates the object and sets it {@link PooledObjectState#IDLE IDLE} - * if it is currently {@link PooledObjectState#ALLOCATED ALLOCATED}. + * if it is currently {@link PooledObjectState#ALLOCATED ALLOCATED} + * or {@link PooledObjectState#RETURNING RETURNING}. * * @return {@code true} if the state was {@link PooledObjectState#ALLOCATED ALLOCATED} + * or {@link PooledObjectState#RETURNING RETURNING}. */ @Override public synchronized boolean deallocate() {