This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-pool.git
commit fa305748f6404dd7925c1d55de4d4cfe6ec2b3f6 Author: Mark Thomas <[email protected]> AuthorDate: Fri May 3 17:59:15 2019 +0100 Clean-up - remove left over merge conflict markers --- src/main/java/org/apache/commons/pool2/KeyedObjectPool.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java b/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java index 6b9a72f..8fb0286 100644 --- a/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java @@ -183,14 +183,14 @@ public interface KeyedObjectPool<K, V> extends Closeable { * @param key the key to query * @return the number of instances currently borrowed from but not yet * returned to the pool corresponding to the given <code>key</code>. -= */ + */ int getNumActive(K key); /** * Returns the total number of instances currently idle in this pool. * Returns a negative value if this information is not available. * @return the total number of instances currently idle in this pool. - = */ + */ int getNumIdle(); /**
