CR iteration 2

apache · Jun 21, 2021 · 91a4083 · 91a4083
1 parent 34db391
commit 91a4083
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
@@ -1054,10 +1054,10 @@ public void evict() throws Exception {
                                     destroy(evictionKey, underTest, true, DestroyMode.NORMAL);
                                     destroyedByEvictorCount.incrementAndGet();
                                     if (validationThrowable != null) {
-                                        final NoSuchElementException nsee
-                                                = new NoSuchElementException("Unable to validate object");
-                                        nsee.initCause(validationThrowable);
-                                        throw nsee;
+                                        if (validationThrowable instanceof RuntimeException) {
+                                            throw (RuntimeException) validationThrowable;
+                                        }
+                                        throw (Error) validationThrowable;
                                     }
                                 } else {
                                     try {

diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
@@ -746,10 +746,10 @@ public void evict() throws Exception {
                                     destroy(underTest, DestroyMode.NORMAL);
                                     destroyedByEvictorCount.incrementAndGet();
                                     if (validationThrowable != null) {
-                                        final NoSuchElementException nsee
-                                                = new NoSuchElementException("Unable to validate object");
-                                        nsee.initCause(validationThrowable);
-                                        throw nsee;
+                                        if (validationThrowable instanceof RuntimeException) {
+                                            throw (RuntimeException) validationThrowable;
+                                        }
+                                        throw (Error) validationThrowable;
                                     }
                                 } else {
                                     try {

diff --git a/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java
@@ -1572,8 +1572,8 @@ public void testExceptionInValidationDuringEviction() throws Exception {
         simpleFactory.setThrowExceptionOnValidate(true);
         try {
             gkoPool.evict();
-            fail("Expecting NoSuchElementException");
-        } catch (NoSuchElementException e) {
+            fail("Expecting RuntimeException");
+        } catch (RuntimeException e) {
             // expected
         }
         assertEquals(0, gkoPool.getNumActive());

diff --git a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java
@@ -1725,8 +1725,8 @@ public void testExceptionInValidationDuringEviction() throws Exception {
 
         try {
             genericObjectPool.evict();
-            fail("Expecting NoSuchElementException");
-        } catch (NoSuchElementException e) {
+            fail("Expecting RuntimeException");
+        } catch (RuntimeException e) {
             // expected
         }
         assertEquals(0, genericObjectPool.getNumActive());