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 70f8110 Javadoc. Try-with-resources.
70f8110 is described below
commit 70f8110df37d49f02e8bde3c673d9dc7d0954a3e
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Wed Jun 23 11:59:17 2021 -0400
Javadoc. Try-with-resources.
---
.../commons/pool2/impl/TestGenericObjectPool.java | 2 +-
.../impl/TestGenericObjectPoolClassLoaders.java | 77 ++++++++++------------
2 files changed, 36 insertions(+), 43 deletions(-)
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 f95132d..1014588 100644
--- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
+++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -963,7 +963,7 @@ public class TestGenericObjectPool extends
TestBaseObjectPool {
/**
* Check that a pool that starts an evictor, but is never closed does not
- * leave EvictionTimer executor running. Confirmation check is in teardown.
+ * leave EvictionTimer executor running. Confirmation check is in {@link
#tearDown()}.
*/
@SuppressWarnings("deprecation")
@Test
diff --git
a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolClassLoaders.java
b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolClassLoaders.java
index c7731f0..7191523 100644
---
a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolClassLoaders.java
+++
b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPoolClassLoaders.java
@@ -26,7 +26,6 @@ import org.apache.commons.pool2.BasePooledObjectFactory;
import org.apache.commons.pool2.PooledObject;
import org.junit.jupiter.api.Test;
-
public class TestGenericObjectPoolClassLoaders {
private static class CustomClassLoader extends URLClassLoader {
@@ -71,54 +70,48 @@ public class TestGenericObjectPoolClassLoaders {
}
}
- private static final URL BASE_URL =
- TestGenericObjectPoolClassLoaders.class.getResource(
- "/org/apache/commons/pool2/impl/");
+ private static final URL BASE_URL = TestGenericObjectPoolClassLoaders.class
+ .getResource("/org/apache/commons/pool2/impl/");
@Test
public void testContextClassLoader() throws Exception {
- final ClassLoader savedClassloader =
- Thread.currentThread().getContextClassLoader();
+ final ClassLoader savedClassloader =
Thread.currentThread().getContextClassLoader();
- try {
- final CustomClassLoader cl1 = new CustomClassLoader(1);
+ try (final CustomClassLoader cl1 = new CustomClassLoader(1)) {
Thread.currentThread().setContextClassLoader(cl1);
- final CustomClassLoaderObjectFactory factory1 =
- new CustomClassLoaderObjectFactory(1);
- final GenericObjectPool<URL> pool1 = new
GenericObjectPool<>(factory1);
- pool1.setMinIdle(1);
- pool1.setTimeBetweenEvictionRuns(Duration.ofMillis(100));
- int counter = 0;
- while (counter < 50 && pool1.getNumIdle() != 1) {
- Thread.sleep(100);
- counter++;
- }
- assertEquals( 1, pool1.getNumIdle(),"Wrong number of idle objects
in pool1");
-
- final CustomClassLoader cl2 = new CustomClassLoader(2);
- Thread.currentThread().setContextClassLoader(cl2);
- final CustomClassLoaderObjectFactory factory2 =
- new CustomClassLoaderObjectFactory(2);
- final GenericObjectPool<URL> pool2 =
- new GenericObjectPool<>(factory2);
- pool2.setMinIdle(1);
-
- pool2.addObject();
- assertEquals( 1, pool2.getNumIdle(),"Wrong number of idle objects
in pool2");
- pool2.clear();
-
- pool2.setTimeBetweenEvictionRuns(Duration.ofMillis(100));
-
- counter = 0;
- while (counter < 50 && pool2.getNumIdle() != 1) {
- Thread.sleep(100);
- counter++;
+ final CustomClassLoaderObjectFactory factory1 = new
CustomClassLoaderObjectFactory(1);
+ try (final GenericObjectPool<URL> pool1 = new
GenericObjectPool<>(factory1)) {
+ pool1.setMinIdle(1);
+ pool1.setTimeBetweenEvictionRuns(Duration.ofMillis(100));
+ int counter = 0;
+ while (counter < 50 && pool1.getNumIdle() != 1) {
+ Thread.sleep(100);
+ counter++;
+ }
+ assertEquals(1, pool1.getNumIdle(), "Wrong number of idle
objects in pool1");
+
+ try (final CustomClassLoader cl2 = new CustomClassLoader(2)) {
+ Thread.currentThread().setContextClassLoader(cl2);
+ final CustomClassLoaderObjectFactory factory2 = new
CustomClassLoaderObjectFactory(2);
+ try (final GenericObjectPool<URL> pool2 = new
GenericObjectPool<>(factory2)) {
+ pool2.setMinIdle(1);
+
+ pool2.addObject();
+ assertEquals(1, pool2.getNumIdle(), "Wrong number of
idle objects in pool2");
+ pool2.clear();
+
+
pool2.setTimeBetweenEvictionRuns(Duration.ofMillis(100));
+
+ counter = 0;
+ while (counter < 50 && pool2.getNumIdle() != 1) {
+ Thread.sleep(100);
+ counter++;
+ }
+ assertEquals(1, pool2.getNumIdle(), "Wrong number of
idle objects in pool2");
+ }
+ }
}
- assertEquals( 1, pool2.getNumIdle(),"Wrong number of idle objects
in pool2");
-
- pool1.close();
- pool2.close();
} finally {
Thread.currentThread().setContextClassLoader(savedClassloader);
}
