This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-pool.git
The following commit(s) were added to refs/heads/master by this push:
new 057eed6 Remove leading underscores from instance variable names.
057eed6 is described below
commit 057eed65a559d0b4408ca2fb9a823510ad3fedf4
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Aug 13 18:20:41 2021 -0400
Remove leading underscores from instance variable names.
---
.../apache/commons/pool2/TestBaseObjectPool.java | 166 ++++++------
.../apache/commons/pool2/TestKeyedObjectPool.java | 286 ++++++++++-----------
.../pool2/impl/TestAbandonedKeyedObjectPool.java | 6 +-
.../pool2/impl/TestAbandonedObjectPool.java | 22 +-
.../pool2/impl/TestGenericKeyedObjectPool.java | 128 ++++-----
.../commons/pool2/impl/TestGenericObjectPool.java | 132 +++++-----
6 files changed, 369 insertions(+), 371 deletions(-)
diff --git a/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
b/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
index 58b849a..5a8f524 100644
--- a/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java
@@ -40,7 +40,7 @@ public class TestBaseObjectPool extends TestObjectPool {
}
}
- private ObjectPool<String> _pool;
+ private ObjectPool<String> pool;
/**
* @param n Ignored by this implemented. Used by sub-classes.
@@ -91,65 +91,65 @@ public class TestBaseObjectPool extends TestObjectPool {
@Test
public void testBaseAddObject() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException e) {
return; // skip this test if unsupported
}
try {
- assertEquals(0, _pool.getNumIdle());
- assertEquals(0, _pool.getNumActive());
- _pool.addObject();
- assertEquals(1, _pool.getNumIdle());
- assertEquals(0, _pool.getNumActive());
- final String obj = _pool.borrowObject();
+ assertEquals(0, pool.getNumIdle());
+ assertEquals(0, pool.getNumActive());
+ pool.addObject();
+ assertEquals(1, pool.getNumIdle());
+ assertEquals(0, pool.getNumActive());
+ final String obj = pool.borrowObject();
assertEquals(getNthObject(0), obj);
- assertEquals(0, _pool.getNumIdle());
- assertEquals(1, _pool.getNumActive());
- _pool.returnObject(obj);
- assertEquals(1, _pool.getNumIdle());
- assertEquals(0, _pool.getNumActive());
+ assertEquals(0, pool.getNumIdle());
+ assertEquals(1, pool.getNumActive());
+ pool.returnObject(obj);
+ assertEquals(1, pool.getNumIdle());
+ assertEquals(0, pool.getNumActive());
} catch(final UnsupportedOperationException e) {
return; // skip this test if one of those calls is unsupported
} finally {
- _pool.close();
+ pool.close();
}
}
@Test
public void testBaseBorrow() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException e) {
return; // skip this test if unsupported
}
- assertEquals(getNthObject(0), _pool.borrowObject());
- assertEquals(getNthObject(1), _pool.borrowObject());
- assertEquals(getNthObject(2), _pool.borrowObject());
- _pool.close();
+ assertEquals(getNthObject(0), pool.borrowObject());
+ assertEquals(getNthObject(1), pool.borrowObject());
+ assertEquals(getNthObject(2), pool.borrowObject());
+ pool.close();
}
@Test
public void testBaseBorrowReturn() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException e) {
return; // skip this test if unsupported
}
- String obj0 = _pool.borrowObject();
+ String obj0 = pool.borrowObject();
assertEquals(getNthObject(0), obj0);
- String obj1 = _pool.borrowObject();
+ String obj1 = pool.borrowObject();
assertEquals(getNthObject(1), obj1);
- String obj2 = _pool.borrowObject();
+ String obj2 = pool.borrowObject();
assertEquals(getNthObject(2), obj2);
- _pool.returnObject(obj2);
- obj2 = _pool.borrowObject();
+ pool.returnObject(obj2);
+ obj2 = pool.borrowObject();
assertEquals(getNthObject(2), obj2);
- _pool.returnObject(obj1);
- obj1 = _pool.borrowObject();
+ pool.returnObject(obj1);
+ obj1 = pool.borrowObject();
assertEquals(getNthObject(1), obj1);
- _pool.returnObject(obj0);
- _pool.returnObject(obj2);
- obj2 = _pool.borrowObject();
+ pool.returnObject(obj0);
+ pool.returnObject(obj2);
+ obj2 = pool.borrowObject();
if (isLifo()) {
assertEquals(getNthObject(2),obj2);
}
@@ -157,54 +157,54 @@ public class TestBaseObjectPool extends TestObjectPool {
assertEquals(getNthObject(0),obj2);
}
- obj0 = _pool.borrowObject();
+ obj0 = pool.borrowObject();
if (isLifo()) {
assertEquals(getNthObject(0),obj0);
}
if (isFifo()) {
assertEquals(getNthObject(2),obj0);
}
- _pool.close();
+ pool.close();
}
@Test
public void testBaseClear() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch (final UnsupportedOperationException e) {
return; // skip this test if unsupported
}
- assertEquals(0, _pool.getNumActive());
- assertEquals(0, _pool.getNumIdle());
- final String obj0 = _pool.borrowObject();
- final String obj1 = _pool.borrowObject();
- assertEquals(2, _pool.getNumActive());
- assertEquals(0, _pool.getNumIdle());
- _pool.returnObject(obj1);
- _pool.returnObject(obj0);
- assertEquals(0, _pool.getNumActive());
- assertEquals(2, _pool.getNumIdle());
- _pool.clear();
- assertEquals(0, _pool.getNumActive());
- assertEquals(0, _pool.getNumIdle());
- final Object obj2 = _pool.borrowObject();
+ assertEquals(0, pool.getNumActive());
+ assertEquals(0, pool.getNumIdle());
+ final String obj0 = pool.borrowObject();
+ final String obj1 = pool.borrowObject();
+ assertEquals(2, pool.getNumActive());
+ assertEquals(0, pool.getNumIdle());
+ pool.returnObject(obj1);
+ pool.returnObject(obj0);
+ assertEquals(0, pool.getNumActive());
+ assertEquals(2, pool.getNumIdle());
+ pool.clear();
+ assertEquals(0, pool.getNumActive());
+ assertEquals(0, pool.getNumIdle());
+ final Object obj2 = pool.borrowObject();
assertEquals(getNthObject(2), obj2);
- _pool.close();
+ pool.close();
}
@Test
public void testBaseClosePool() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException e) {
return; // skip this test if unsupported
}
- final String obj = _pool.borrowObject();
- _pool.returnObject(obj);
+ final String obj = pool.borrowObject();
+ pool.returnObject(obj);
- _pool.close();
+ pool.close();
try {
- _pool.borrowObject();
+ pool.borrowObject();
fail("Expected IllegalStateException");
} catch(final IllegalStateException e) {
// expected
@@ -214,47 +214,47 @@ public class TestBaseObjectPool extends TestObjectPool {
@Test
public void testBaseInvalidateObject() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch (final UnsupportedOperationException e) {
return; // skip this test if unsupported
}
- assertEquals(0, _pool.getNumActive());
- assertEquals(0, _pool.getNumIdle());
- final String obj0 = _pool.borrowObject();
- final String obj1 = _pool.borrowObject();
- assertEquals(2, _pool.getNumActive());
- assertEquals(0, _pool.getNumIdle());
- _pool.invalidateObject(obj0);
- assertEquals(1, _pool.getNumActive());
- assertEquals(0, _pool.getNumIdle());
- _pool.invalidateObject(obj1);
- assertEquals(0, _pool.getNumActive());
- assertEquals(0, _pool.getNumIdle());
- _pool.close();
+ assertEquals(0, pool.getNumActive());
+ assertEquals(0, pool.getNumIdle());
+ final String obj0 = pool.borrowObject();
+ final String obj1 = pool.borrowObject();
+ assertEquals(2, pool.getNumActive());
+ assertEquals(0, pool.getNumIdle());
+ pool.invalidateObject(obj0);
+ assertEquals(1, pool.getNumActive());
+ assertEquals(0, pool.getNumIdle());
+ pool.invalidateObject(obj1);
+ assertEquals(0, pool.getNumActive());
+ assertEquals(0, pool.getNumIdle());
+ pool.close();
}
@Test
public void testBaseNumActiveNumIdle() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch (final UnsupportedOperationException e) {
return; // skip this test if unsupported
}
- assertEquals(0, _pool.getNumActive());
- assertEquals(0, _pool.getNumIdle());
- final String obj0 = _pool.borrowObject();
- assertEquals(1, _pool.getNumActive());
- assertEquals(0, _pool.getNumIdle());
- final String obj1 = _pool.borrowObject();
- assertEquals(2, _pool.getNumActive());
- assertEquals(0, _pool.getNumIdle());
- _pool.returnObject(obj1);
- assertEquals(1, _pool.getNumActive());
- assertEquals(1, _pool.getNumIdle());
- _pool.returnObject(obj0);
- assertEquals(0, _pool.getNumActive());
- assertEquals(2, _pool.getNumIdle());
- _pool.close();
+ assertEquals(0, pool.getNumActive());
+ assertEquals(0, pool.getNumIdle());
+ final String obj0 = pool.borrowObject();
+ assertEquals(1, pool.getNumActive());
+ assertEquals(0, pool.getNumIdle());
+ final String obj1 = pool.borrowObject();
+ assertEquals(2, pool.getNumActive());
+ assertEquals(0, pool.getNumIdle());
+ pool.returnObject(obj1);
+ assertEquals(1, pool.getNumActive());
+ assertEquals(1, pool.getNumIdle());
+ pool.returnObject(obj0);
+ assertEquals(0, pool.getNumActive());
+ assertEquals(2, pool.getNumIdle());
+ pool.close();
}
@Test
diff --git a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
index 6979288..7b7f1b5 100644
--- a/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java
@@ -173,7 +173,7 @@ public abstract class TestKeyedObjectPool {
protected static final String KEY = "key";
- private KeyedObjectPool<Object,Object> _pool;
+ private KeyedObjectPool<Object,Object> pool;
// Deliberate choice to create a new object in case future unit tests check
// for a specific object.
@@ -234,237 +234,237 @@ public abstract class TestKeyedObjectPool {
@AfterEach
public void tearDown() {
- _pool = null;
+ pool = null;
}
@Test
public void testBaseAddObject() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException uoe) {
return; // skip this test if unsupported
}
final Object key = makeKey(0);
try {
- assertEquals(0,_pool.getNumIdle());
- assertEquals(0,_pool.getNumActive());
- assertEquals(0,_pool.getNumIdle(key));
- assertEquals(0,_pool.getNumActive(key));
- _pool.addObject(key);
- assertEquals(1,_pool.getNumIdle());
- assertEquals(0,_pool.getNumActive());
- assertEquals(1,_pool.getNumIdle(key));
- assertEquals(0,_pool.getNumActive(key));
- final Object obj = _pool.borrowObject(key);
+ assertEquals(0,pool.getNumIdle());
+ assertEquals(0,pool.getNumActive());
+ assertEquals(0,pool.getNumIdle(key));
+ assertEquals(0,pool.getNumActive(key));
+ pool.addObject(key);
+ assertEquals(1,pool.getNumIdle());
+ assertEquals(0,pool.getNumActive());
+ assertEquals(1,pool.getNumIdle(key));
+ assertEquals(0,pool.getNumActive(key));
+ final Object obj = pool.borrowObject(key);
assertEquals(getNthObject(key,0),obj);
- assertEquals(0,_pool.getNumIdle());
- assertEquals(1,_pool.getNumActive());
- assertEquals(0,_pool.getNumIdle(key));
- assertEquals(1,_pool.getNumActive(key));
- _pool.returnObject(key,obj);
- assertEquals(1,_pool.getNumIdle());
- assertEquals(0,_pool.getNumActive());
- assertEquals(1,_pool.getNumIdle(key));
- assertEquals(0,_pool.getNumActive(key));
+ assertEquals(0,pool.getNumIdle());
+ assertEquals(1,pool.getNumActive());
+ assertEquals(0,pool.getNumIdle(key));
+ assertEquals(1,pool.getNumActive(key));
+ pool.returnObject(key,obj);
+ assertEquals(1,pool.getNumIdle());
+ assertEquals(0,pool.getNumActive());
+ assertEquals(1,pool.getNumIdle(key));
+ assertEquals(0,pool.getNumActive(key));
} catch(final UnsupportedOperationException e) {
return; // skip this test if one of those calls is unsupported
} finally {
- _pool.close();
+ pool.close();
}
}
@Test
public void testBaseBorrow() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException uoe) {
return; // skip this test if unsupported
}
final Object keya = makeKey(0);
final Object keyb = makeKey(1);
- assertEquals(getNthObject(keya,0),_pool.borrowObject(keya),"1");
- assertEquals(getNthObject(keyb,0),_pool.borrowObject(keyb),"2");
- assertEquals(getNthObject(keyb,1),_pool.borrowObject(keyb),"3");
- assertEquals(getNthObject(keya,1),_pool.borrowObject(keya),"4");
- assertEquals(getNthObject(keyb,2),_pool.borrowObject(keyb),"5");
- assertEquals(getNthObject(keya,2),_pool.borrowObject(keya),"6");
- _pool.close();
+ assertEquals(getNthObject(keya,0),pool.borrowObject(keya),"1");
+ assertEquals(getNthObject(keyb,0),pool.borrowObject(keyb),"2");
+ assertEquals(getNthObject(keyb,1),pool.borrowObject(keyb),"3");
+ assertEquals(getNthObject(keya,1),pool.borrowObject(keya),"4");
+ assertEquals(getNthObject(keyb,2),pool.borrowObject(keyb),"5");
+ assertEquals(getNthObject(keya,2),pool.borrowObject(keya),"6");
+ pool.close();
}
@Test
public void testBaseBorrowReturn() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException uoe) {
return; // skip this test if unsupported
}
final Object keya = makeKey(0);
- Object obj0 = _pool.borrowObject(keya);
+ Object obj0 = pool.borrowObject(keya);
assertEquals(getNthObject(keya,0),obj0);
- Object obj1 = _pool.borrowObject(keya);
+ Object obj1 = pool.borrowObject(keya);
assertEquals(getNthObject(keya,1),obj1);
- Object obj2 = _pool.borrowObject(keya);
+ Object obj2 = pool.borrowObject(keya);
assertEquals(getNthObject(keya,2),obj2);
- _pool.returnObject(keya,obj2);
- obj2 = _pool.borrowObject(keya);
+ pool.returnObject(keya,obj2);
+ obj2 = pool.borrowObject(keya);
assertEquals(getNthObject(keya,2),obj2);
- _pool.returnObject(keya,obj1);
- obj1 = _pool.borrowObject(keya);
+ pool.returnObject(keya,obj1);
+ obj1 = pool.borrowObject(keya);
assertEquals(getNthObject(keya,1),obj1);
- _pool.returnObject(keya,obj0);
- _pool.returnObject(keya,obj2);
- obj2 = _pool.borrowObject(keya);
+ pool.returnObject(keya,obj0);
+ pool.returnObject(keya,obj2);
+ obj2 = pool.borrowObject(keya);
if (isLifo()) {
assertEquals(getNthObject(keya,2),obj2);
}
if (isFifo()) {
assertEquals(getNthObject(keya,0),obj2);
}
- obj0 = _pool.borrowObject(keya);
+ obj0 = pool.borrowObject(keya);
if (isLifo()) {
assertEquals(getNthObject(keya,0),obj0);
}
if (isFifo()) {
assertEquals(getNthObject(keya,2),obj0);
}
- _pool.close();
+ pool.close();
}
@Test
public void testBaseClear() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException uoe) {
return; // skip this test if unsupported
}
final Object keya = makeKey(0);
- assertEquals(0,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- final Object obj0 = _pool.borrowObject(keya);
- final Object obj1 = _pool.borrowObject(keya);
- assertEquals(2,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- _pool.returnObject(keya,obj1);
- _pool.returnObject(keya,obj0);
- assertEquals(0,_pool.getNumActive(keya));
- assertEquals(2,_pool.getNumIdle(keya));
- _pool.clear(keya);
- assertEquals(0,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- final Object obj2 = _pool.borrowObject(keya);
+ assertEquals(0,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ final Object obj0 = pool.borrowObject(keya);
+ final Object obj1 = pool.borrowObject(keya);
+ assertEquals(2,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ pool.returnObject(keya,obj1);
+ pool.returnObject(keya,obj0);
+ assertEquals(0,pool.getNumActive(keya));
+ assertEquals(2,pool.getNumIdle(keya));
+ pool.clear(keya);
+ assertEquals(0,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ final Object obj2 = pool.borrowObject(keya);
assertEquals(getNthObject(keya,2),obj2);
- _pool.close();
+ pool.close();
}
@Test
public void testBaseInvalidateObject() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException uoe) {
return; // skip this test if unsupported
}
final Object keya = makeKey(0);
- assertEquals(0,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- final Object obj0 = _pool.borrowObject(keya);
- final Object obj1 = _pool.borrowObject(keya);
- assertEquals(2,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- _pool.invalidateObject(keya,obj0);
- assertEquals(1,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- _pool.invalidateObject(keya,obj1);
- assertEquals(0,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- _pool.close();
+ assertEquals(0,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ final Object obj0 = pool.borrowObject(keya);
+ final Object obj1 = pool.borrowObject(keya);
+ assertEquals(2,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ pool.invalidateObject(keya,obj0);
+ assertEquals(1,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ pool.invalidateObject(keya,obj1);
+ assertEquals(0,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ pool.close();
}
@Test
public void testBaseNumActiveNumIdle() throws Exception {
try {
- _pool = makeEmptyPool(3);
+ pool = makeEmptyPool(3);
} catch(final UnsupportedOperationException uoe) {
return; // skip this test if unsupported
}
final Object keya = makeKey(0);
- assertEquals(0,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- final Object obj0 = _pool.borrowObject(keya);
- assertEquals(1,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- final Object obj1 = _pool.borrowObject(keya);
- assertEquals(2,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- _pool.returnObject(keya,obj1);
- assertEquals(1,_pool.getNumActive(keya));
- assertEquals(1,_pool.getNumIdle(keya));
- _pool.returnObject(keya,obj0);
- assertEquals(0,_pool.getNumActive(keya));
- assertEquals(2,_pool.getNumIdle(keya));
-
- assertEquals(0,_pool.getNumActive("xyzzy12345"));
- assertEquals(0,_pool.getNumIdle("xyzzy12345"));
-
- _pool.close();
+ assertEquals(0,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ final Object obj0 = pool.borrowObject(keya);
+ assertEquals(1,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ final Object obj1 = pool.borrowObject(keya);
+ assertEquals(2,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ pool.returnObject(keya,obj1);
+ assertEquals(1,pool.getNumActive(keya));
+ assertEquals(1,pool.getNumIdle(keya));
+ pool.returnObject(keya,obj0);
+ assertEquals(0,pool.getNumActive(keya));
+ assertEquals(2,pool.getNumIdle(keya));
+
+ assertEquals(0,pool.getNumActive("xyzzy12345"));
+ assertEquals(0,pool.getNumIdle("xyzzy12345"));
+
+ pool.close();
}
@Test
public void testBaseNumActiveNumIdle2() throws Exception {
try {
- _pool = makeEmptyPool(6);
+ pool = makeEmptyPool(6);
} catch(final UnsupportedOperationException uoe) {
return; // skip this test if unsupported
}
final Object keya = makeKey(0);
final Object keyb = makeKey(1);
- assertEquals(0,_pool.getNumActive());
- assertEquals(0,_pool.getNumIdle());
- assertEquals(0,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- assertEquals(0,_pool.getNumActive(keyb));
- assertEquals(0,_pool.getNumIdle(keyb));
-
- final Object objA0 = _pool.borrowObject(keya);
- final Object objB0 = _pool.borrowObject(keyb);
-
- assertEquals(2,_pool.getNumActive());
- assertEquals(0,_pool.getNumIdle());
- assertEquals(1,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- assertEquals(1,_pool.getNumActive(keyb));
- assertEquals(0,_pool.getNumIdle(keyb));
-
- final Object objA1 = _pool.borrowObject(keya);
- final Object objB1 = _pool.borrowObject(keyb);
-
- assertEquals(4,_pool.getNumActive());
- assertEquals(0,_pool.getNumIdle());
- assertEquals(2,_pool.getNumActive(keya));
- assertEquals(0,_pool.getNumIdle(keya));
- assertEquals(2,_pool.getNumActive(keyb));
- assertEquals(0,_pool.getNumIdle(keyb));
-
- _pool.returnObject(keya,objA0);
- _pool.returnObject(keyb,objB0);
-
- assertEquals(2,_pool.getNumActive());
- assertEquals(2,_pool.getNumIdle());
- assertEquals(1,_pool.getNumActive(keya));
- assertEquals(1,_pool.getNumIdle(keya));
- assertEquals(1,_pool.getNumActive(keyb));
- assertEquals(1,_pool.getNumIdle(keyb));
-
- _pool.returnObject(keya,objA1);
- _pool.returnObject(keyb,objB1);
-
- assertEquals(0,_pool.getNumActive());
- assertEquals(4,_pool.getNumIdle());
- assertEquals(0,_pool.getNumActive(keya));
- assertEquals(2,_pool.getNumIdle(keya));
- assertEquals(0,_pool.getNumActive(keyb));
- assertEquals(2,_pool.getNumIdle(keyb));
-
- _pool.close();
+ assertEquals(0,pool.getNumActive());
+ assertEquals(0,pool.getNumIdle());
+ assertEquals(0,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ assertEquals(0,pool.getNumActive(keyb));
+ assertEquals(0,pool.getNumIdle(keyb));
+
+ final Object objA0 = pool.borrowObject(keya);
+ final Object objB0 = pool.borrowObject(keyb);
+
+ assertEquals(2,pool.getNumActive());
+ assertEquals(0,pool.getNumIdle());
+ assertEquals(1,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ assertEquals(1,pool.getNumActive(keyb));
+ assertEquals(0,pool.getNumIdle(keyb));
+
+ final Object objA1 = pool.borrowObject(keya);
+ final Object objB1 = pool.borrowObject(keyb);
+
+ assertEquals(4,pool.getNumActive());
+ assertEquals(0,pool.getNumIdle());
+ assertEquals(2,pool.getNumActive(keya));
+ assertEquals(0,pool.getNumIdle(keya));
+ assertEquals(2,pool.getNumActive(keyb));
+ assertEquals(0,pool.getNumIdle(keyb));
+
+ pool.returnObject(keya,objA0);
+ pool.returnObject(keyb,objB0);
+
+ assertEquals(2,pool.getNumActive());
+ assertEquals(2,pool.getNumIdle());
+ assertEquals(1,pool.getNumActive(keya));
+ assertEquals(1,pool.getNumIdle(keya));
+ assertEquals(1,pool.getNumActive(keyb));
+ assertEquals(1,pool.getNumIdle(keyb));
+
+ pool.returnObject(keya,objA1);
+ pool.returnObject(keyb,objB1);
+
+ assertEquals(0,pool.getNumActive());
+ assertEquals(4,pool.getNumIdle());
+ assertEquals(0,pool.getNumActive(keya));
+ assertEquals(2,pool.getNumIdle(keya));
+ assertEquals(0,pool.getNumActive(keyb));
+ assertEquals(2,pool.getNumIdle(keyb));
+
+ pool.close();
}
@Test
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
index 70a02f2..7e93c5b 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedKeyedObjectPool.java
@@ -47,16 +47,16 @@ import org.junit.jupiter.api.Test;
public class TestAbandonedKeyedObjectPool {
class ConcurrentBorrower extends Thread {
- private final ArrayList<PooledTestObject> _borrowed;
+ private final ArrayList<PooledTestObject> borrowed;
public ConcurrentBorrower(final ArrayList<PooledTestObject> borrowed) {
- _borrowed = borrowed;
+ this.borrowed = borrowed;
}
@Override
public void run() {
try {
- _borrowed.add(pool.borrowObject(0));
+ borrowed.add(pool.borrowObject(0));
} catch (final Exception e) {
// expected in most cases
}
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
index b2e37f1..e69902e 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java
@@ -45,17 +45,17 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
class PooledTestObject implements TrackedUse {
- private static final AtomicInteger hash = new AtomicInteger();
+ private static final AtomicInteger ATOMIC_HASH = new AtomicInteger();
private static final Instant INSTANT_0 = Instant.ofEpochMilli(0);
private static final Instant INSTANT_1 = Instant.ofEpochMilli(1);
private boolean active;
private boolean destroyed;
- private int _hash;
- private boolean _abandoned;
+ private int hash;
+ private boolean abandoned;
private boolean detached; // destroy-abandoned "detaches"
public PooledTestObject() {
- _hash = hash.incrementAndGet();
+ this.hash = ATOMIC_HASH.incrementAndGet();
}
public void destroy(final DestroyMode mode) {
@@ -75,7 +75,7 @@ class PooledTestObject implements TrackedUse {
@Override
public long getLastUsed() {
- if (_abandoned) {
+ if (abandoned) {
// Abandoned object sweep will occur no matter what the value of
removeAbandonedTimeout,
// because this indicates that this object was last used decades
ago
return 1;
@@ -86,7 +86,7 @@ class PooledTestObject implements TrackedUse {
@Override
public Instant getLastUsedInstant() {
- if (_abandoned) {
+ if (abandoned) {
// Abandoned object sweep will occur no matter what the value of
removeAbandonedTimeout,
// because this indicates that this object was last used decades
ago
return INSTANT_1;
@@ -97,7 +97,7 @@ class PooledTestObject implements TrackedUse {
@Override
public int hashCode() {
- return _hash;
+ return hash;
}
public synchronized boolean isActive() {
@@ -113,7 +113,7 @@ class PooledTestObject implements TrackedUse {
}
public void setAbandoned(final boolean b) {
- _abandoned = b;
+ abandoned = b;
}
public synchronized void setActive(final boolean b) {
@@ -127,16 +127,16 @@ class PooledTestObject implements TrackedUse {
public class TestAbandonedObjectPool {
class ConcurrentBorrower extends Thread {
- private final ArrayList<PooledTestObject> _borrowed;
+ private final ArrayList<PooledTestObject> borrowed;
public ConcurrentBorrower(final ArrayList<PooledTestObject> borrowed) {
- _borrowed = borrowed;
+ this.borrowed = borrowed;
}
@Override
public void run() {
try {
- _borrowed.add(pool.borrowObject());
+ borrowed.add(pool.borrowObject());
} catch (final Exception e) {
// expected in most cases
}
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
index f4bf94f..91bb642 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
@@ -297,19 +297,19 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
* the provided pool with the specified key and returns it
*/
static class SimpleTestThread<T> implements Runnable {
- private final KeyedObjectPool<String,T> _pool;
- private final String _key;
+ private final KeyedObjectPool<String,T> pool;
+ private final String key;
public SimpleTestThread(final KeyedObjectPool<String,T> pool, final
String key) {
- _pool = pool;
- _key = key;
+ this.pool = pool;
+ this.key = key;
}
@Override
public void run() {
try {
- final T obj = _pool.borrowObject(_key);
- _pool.returnObject(_key, obj);
+ final T obj = pool.borrowObject(key);
+ pool.returnObject(key, obj);
} catch (final Exception e) {
// Ignore
}
@@ -339,26 +339,26 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
}
static class TestThread<T> implements Runnable {
- private final java.util.Random _random = new java.util.Random();
+ private final java.util.Random random = new java.util.Random();
/** GKOP to hit */
- private final KeyedObjectPool<String,T> _pool;
+ private final KeyedObjectPool<String,T> pool;
/** number of borrow/return iterations */
- private final int _iter;
+ private final int iter;
/** delay before borrow */
- private final int _startDelay;
+ private final int startDelay;
/** delay before return */
- private final int _holdTime;
+ private final int holdTime;
/** whether or not delays are random (with max = configured values) */
- private final boolean _randomDelay;
+ private final boolean randomDelay;
/** expected object */
- private final T _expectedObject;
+ private final T expectedObject;
/** key used in borrow / return sequence - null means random */
- private final String _key;
+ private final String key;
- private volatile boolean _complete;
- private volatile boolean _failed;
- private volatile Exception _exception;
+ private volatile boolean complete;
+ private volatile boolean failed;
+ private volatile Exception exception;
public TestThread(final KeyedObjectPool<String,T> pool) {
this(pool, 100, 50, 50, true, null, null);
@@ -374,57 +374,57 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
public TestThread(final KeyedObjectPool<String,T> pool, final int
iter, final int startDelay,
final int holdTime, final boolean randomDelay, final T
expectedObject, final String key) {
- _pool = pool;
- _iter = iter;
- _startDelay = startDelay;
- _holdTime = holdTime;
- _randomDelay = randomDelay;
- _expectedObject = expectedObject;
- _key = key;
+ this.pool = pool;
+ this.iter = iter;
+ this.startDelay = startDelay;
+ this.holdTime = holdTime;
+ this.randomDelay = randomDelay;
+ this.expectedObject = expectedObject;
+ this.key = key;
}
public boolean complete() {
- return _complete;
+ return complete;
}
public boolean failed() {
- return _failed;
+ return failed;
}
@Override
public void run() {
- for(int i=0;i<_iter;i++) {
- final String key = _key == null ?
String.valueOf(_random.nextInt(3)) : _key;
- Waiter.sleepQuietly(_randomDelay ?
_random.nextInt(_startDelay) : _startDelay);
+ for(int i=0;i<iter;i++) {
+ final String actualKey = key == null ?
String.valueOf(random.nextInt(3)) : key;
+ Waiter.sleepQuietly(randomDelay ? random.nextInt(startDelay) :
startDelay);
T obj = null;
try {
- obj = _pool.borrowObject(key);
+ obj = pool.borrowObject(actualKey);
} catch(final Exception e) {
- _exception = e;
- _failed = true;
- _complete = true;
+ exception = e;
+ failed = true;
+ complete = true;
break;
}
- if (_expectedObject != null && !_expectedObject.equals(obj)) {
- _exception = new Exception("Expected: "+_expectedObject+ "
found: "+obj);
- _failed = true;
- _complete = true;
+ if (expectedObject != null && !expectedObject.equals(obj)) {
+ exception = new Exception("Expected: "+expectedObject+ "
found: "+obj);
+ failed = true;
+ complete = true;
break;
}
- Waiter.sleepQuietly(_randomDelay ? _random.nextInt(_holdTime)
: _holdTime);
+ Waiter.sleepQuietly(randomDelay ? random.nextInt(holdTime) :
holdTime);
try {
- _pool.returnObject(key,obj);
+ pool.returnObject(actualKey,obj);
} catch(final Exception e) {
- _exception = e;
- _failed = true;
- _complete = true;
+ exception = e;
+ failed = true;
+ complete = true;
break;
}
}
- _complete = true;
+ complete = true;
}
}
@@ -433,10 +433,10 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
* the provided pool with the specified key and returns it after a wait
*/
static class WaitingTestThread extends Thread {
- private final KeyedObjectPool<String,String> _pool;
- private final String _key;
- private final long _pause;
- private Throwable _thrown;
+ private final KeyedObjectPool<String,String> pool;
+ private final String key;
+ private final long pause;
+ private Throwable thrown;
private long preBorrowMillis; // just before borrow
private long postBorrowMillis; // borrow returned
@@ -445,24 +445,24 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
private String objectId;
public WaitingTestThread(final KeyedObjectPool<String,String> pool,
final String key, final long pause) {
- _pool = pool;
- _key = key;
- _pause = pause;
- _thrown = null;
+ this.pool = pool;
+ this.key = key;
+ this.pause = pause;
+ this.thrown = null;
}
@Override
public void run() {
try {
preBorrowMillis = System.currentTimeMillis();
- final String obj = _pool.borrowObject(_key);
+ final String obj = pool.borrowObject(key);
objectId = obj;
postBorrowMillis = System.currentTimeMillis();
- Thread.sleep(_pause);
- _pool.returnObject(_key, obj);
+ Thread.sleep(pause);
+ pool.returnObject(key, obj);
postReturnMillis = System.currentTimeMillis();
} catch (final Exception e) {
- _thrown = e;
+ thrown = e;
} finally{
endedMillis = System.currentTimeMillis();
}
@@ -846,7 +846,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
}
if(testThread.failed()) {
fail("Thread failed: " + threads.indexOf(testThread) + "\n" +
- getExceptionTrace(testThread._exception));
+ getExceptionTrace(testThread.exception));
}
}
}
@@ -980,7 +980,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
Waiter.sleepQuietly(500L);
}
if (threads[i].failed()) {
- fail("Thread " + i + " failed: " +
threads[i]._exception.toString());
+ fail("Thread " + i + " failed: " +
threads[i].exception.toString());
}
}
}
@@ -1575,8 +1575,8 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
Thread.sleep(20);
pool.invalidateObject("one", obj);
Thread.sleep(600); // Wait for thread2 to timeout
- if (thread2._thrown != null) {
- fail(thread2._thrown.toString());
+ if (thread2.thrown != null) {
+ fail(thread2.thrown.toString());
}
}
}
@@ -1963,8 +1963,8 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
assertFalse(threadA.isAlive());
assertFalse(threadB.isAlive());
- assertFalse(testA._failed);
- assertFalse(testB._failed);
+ assertFalse(testA.failed);
+ assertFalse(testB.failed);
}
@Test
@@ -2007,7 +2007,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
int failed = 0;
for (final WaitingTestThread element : wtt) {
element.join();
- if (element._thrown != null){
+ if (element.thrown != null){
failed++;
}
}
@@ -2027,7 +2027,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
" BorrowTime: " + (wt.postBorrowMillis != 0 ?
wt.postBorrowMillis - wt.preBorrowMillis : -1) +
" PostReturn: " + (wt.postReturnMillis != 0 ?
wt.postReturnMillis - originMillis : -1) +
" Ended: " + (wt.endedMillis - originMillis) +
- " Key: " + (wt._key) +
+ " Key: " + (wt.key) +
" ObjId: " + wt.objectId
);
}
@@ -2506,7 +2506,7 @@ public class TestGenericKeyedObjectPool extends
TestKeyedObjectPool {
Thread.sleep(200);
// Check thread was interrupted
- assertTrue(wtt._thrown instanceof InterruptedException);
+ assertTrue(wtt.thrown instanceof InterruptedException);
}
}
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
index 430e7d3..4b7b980 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -441,29 +441,29 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
static class TestThread<T> implements Runnable {
/** source of random delay times */
- private final java.util.Random _random;
+ private final java.util.Random random;
/** pool to borrow from */
- private final ObjectPool<T> _pool;
+ private final ObjectPool<T> pool;
/** number of borrow attempts */
- private final int _iter;
+ private final int iter;
/** delay before each borrow attempt */
- private final int _startDelay;
+ private final int startDelay;
/** time to hold each borrowed object before returning it */
- private final int _holdTime;
+ private final int holdTime;
/** whether or not start and hold time are randomly generated */
- private final boolean _randomDelay;
+ private final boolean randomDelay;
/** object expected to be borrowed (fail otherwise) */
- private final Object _expectedObject;
+ private final Object expectedObject;
- private volatile boolean _complete;
- private volatile boolean _failed;
- private volatile Throwable _error;
+ private volatile boolean complete;
+ private volatile boolean failed;
+ private volatile Throwable error;
public TestThread(final ObjectPool<T> pool) {
this(pool, 100, 50, true, null);
@@ -489,59 +489,57 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
public TestThread(final ObjectPool<T> pool, final int iter, final int
startDelay,
final int holdTime, final boolean randomDelay, final Object obj) {
- _pool = pool;
- _iter = iter;
- _startDelay = startDelay;
- _holdTime = holdTime;
- _randomDelay = randomDelay;
- _random = _randomDelay ? new Random() : null;
- _expectedObject = obj;
+ this.pool = pool;
+ this.iter = iter;
+ this.startDelay = startDelay;
+ this.holdTime = holdTime;
+ this.randomDelay = randomDelay;
+ this.random = this.randomDelay ? new Random() : null;
+ this.expectedObject = obj;
}
public boolean complete() {
- return _complete;
+ return complete;
}
public boolean failed() {
- return _failed;
+ return failed;
}
@Override
public void run() {
- for(int i=0;i<_iter;i++) {
- final long startDelay =
- _randomDelay ? (long)_random.nextInt(_startDelay) :
_startDelay;
- final long holdTime =
- _randomDelay ? (long)_random.nextInt(_holdTime) :
_holdTime;
- Waiter.sleepQuietly(startDelay);
+ for (int i = 0; i < iter; i++) {
+ final long actualStartDelay = randomDelay ? (long)
random.nextInt(startDelay) : startDelay;
+ final long actualHoldTime = randomDelay ? (long)
random.nextInt(holdTime) : holdTime;
+ Waiter.sleepQuietly(actualStartDelay);
T obj = null;
try {
- obj = _pool.borrowObject();
- } catch(final Exception e) {
- _error = e;
- _failed = true;
- _complete = true;
+ obj = pool.borrowObject();
+ } catch (final Exception e) {
+ error = e;
+ failed = true;
+ complete = true;
break;
}
- if (_expectedObject != null && !_expectedObject.equals(obj)) {
- _error = new Throwable("Expected: "+_expectedObject+ "
found: "+obj);
- _failed = true;
- _complete = true;
+ if (expectedObject != null && !expectedObject.equals(obj)) {
+ error = new Throwable("Expected: " + expectedObject + "
found: " + obj);
+ failed = true;
+ complete = true;
break;
}
- Waiter.sleepQuietly(holdTime);
+ Waiter.sleepQuietly(actualHoldTime);
try {
- _pool.returnObject(obj);
- } catch(final Exception e) {
- _error = e;
- _failed = true;
- _complete = true;
+ pool.returnObject(obj);
+ } catch (final Exception e) {
+ error = e;
+ failed = true;
+ complete = true;
break;
}
}
- _complete = true;
+ complete = true;
}
}
@@ -550,9 +548,9 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
* the provided pool returns it after a wait
*/
static class WaitingTestThread extends Thread {
- private final GenericObjectPool<String> _pool;
- private final long _pause;
- private Throwable _thrown;
+ private final GenericObjectPool<String> pool;
+ private final long pause;
+ private Throwable thrown;
private long preBorrowMillis; // just before borrow
private long postBorrowMillis; // borrow returned
@@ -561,23 +559,23 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
private String objectId;
public WaitingTestThread(final GenericObjectPool<String> pool, final
long pause) {
- _pool = pool;
- _pause = pause;
- _thrown = null;
+ this.pool = pool;
+ this.pause = pause;
+ this.thrown = null;
}
@Override
public void run() {
try {
preBorrowMillis = System.currentTimeMillis();
- final String obj = _pool.borrowObject();
+ final String obj = pool.borrowObject();
objectId = obj;
postBorrowMillis = System.currentTimeMillis();
- Thread.sleep(_pause);
- _pool.returnObject(obj);
+ Thread.sleep(pause);
+ pool.returnObject(obj);
postReturnMillis = System.currentTimeMillis();
} catch (final Throwable e) {
- _thrown = e;
+ thrown = e;
} finally{
endedMillis = System.currentTimeMillis();
}
@@ -909,7 +907,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
Waiter.sleepQuietly(500L);
}
if (threads[i].failed()) {
- fail("Thread " + i + " failed: " +
threads[i]._error.toString());
+ fail("Thread " + i + " failed: " +
threads[i].error.toString());
}
}
}
@@ -1121,7 +1119,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
}
}
if(threads[i].failed()) {
- fail("Thread "+i+" failed: "+threads[i]._error.toString());
+ fail("Thread "+i+" failed: "+threads[i].error.toString());
}
}
}
@@ -1460,8 +1458,8 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
assertFalse(thread1.isAlive());
assertFalse(thread2.isAlive());
- assertTrue(thread1._thrown instanceof UnknownError);
- assertTrue(thread2._thrown instanceof UnknownError);
+ assertTrue(thread1.thrown instanceof UnknownError);
+ assertTrue(thread2.thrown instanceof UnknownError);
}
}
@@ -1917,8 +1915,8 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
assertFalse(thread1.isAlive());
assertFalse(thread2.isAlive());
- assertTrue(thread1._thrown instanceof UnsupportedCharsetException);
- assertTrue(thread2._thrown instanceof UnsupportedCharsetException);
+ assertTrue(thread1.thrown instanceof UnsupportedCharsetException);
+ assertTrue(thread2.thrown instanceof UnsupportedCharsetException);
}
}
@@ -2019,8 +2017,8 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
Thread.sleep(20);
pool.invalidateObject(obj);
Thread.sleep(600); // Wait for thread2 to timeout
- if (thread2._thrown != null) {
- fail(thread2._thrown.toString());
+ if (thread2.thrown != null) {
+ fail(thread2.thrown.toString());
}
}
}
@@ -2171,7 +2169,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
try {
Waiter.sleepQuietly(delay);
obj = genericObjectPool.borrowObject();
- // Under load, observed _numActive > _maxTotal
+ // Under load, observed numActive > maxTotal
if (genericObjectPool.getNumActive() >
genericObjectPool.getMaxTotal()) {
throw new IllegalStateException("Too many active objects");
}
@@ -2196,8 +2194,8 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
Waiter.sleepQuietly(500L);
}
if (threads[i].failed()) {
- threads[i]._error.printStackTrace();
- fail("Thread " + i + " failed: " +
threads[i]._error.toString());
+ threads[i].error.printStackTrace();
+ fail("Thread " + i + " failed: " +
threads[i].error.toString());
}
}
}
@@ -2272,7 +2270,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
try {
Waiter.sleepQuietly(delay);
obj = genericObjectPool.borrowObject();
- // Under load, observed _numActive > _maxTotal
+ // Under load, observed numActive > maxTotal
if (genericObjectPool.getNumActive() >
genericObjectPool.getMaxTotal()) {
throw new IllegalStateException("Too many active objects");
}
@@ -2297,7 +2295,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
Waiter.sleepQuietly(500L);
}
if(threads[i].failed()) {
- fail("Thread " + i + " failed: " +
threads[i]._error.toString());
+ fail("Thread " + i + " failed: " +
threads[i].error.toString());
}
}
}
@@ -2345,7 +2343,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
int failed = 0;
for (final WaitingTestThread element : wtt) {
element.join();
- if (element._thrown != null){
+ if (element.thrown != null){
failed++;
}
}
@@ -3011,7 +3009,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
Thread.sleep(200);
// Check thread was interrupted
- assertTrue(wtt._thrown instanceof InterruptedException);
+ assertTrue(wtt.thrown instanceof InterruptedException);
}
@Test
@@ -3036,7 +3034,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
Thread.sleep(200);
// Check thread was interrupted
- assertTrue(wtt._thrown instanceof InterruptedException);
+ assertTrue(wtt.thrown instanceof InterruptedException);
// Return object to the pool
genericObjectPool.returnObject(obj1);
