commit 344d62ec4c640c13770dfd0f705fe1101e262b11
author Georg Kallidis <gk@apache.org> Mon Oct 23 13:56:18 2023 +0200
committer Georg Kallidis <gk@apache.org> Mon Oct 23 13:56:18 2023 +0200
tree d7d2f4468ed9cdd8e982551de55420a8ba878818
parent 2aba3219d09e18f10b6f29d098b18745463cef72

Update fulcrums deps yaafi anf testcontainer to 2.0.0 and parser to 3.0.0 and commons-pool to 2.12.0, add pool specific exception

pom.xml

diff --git a/pom.xml b/pom.xml
index eea2552..53ae731 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,12 +103,12 @@
     <dependency>
       <groupId>org.apache.fulcrum</groupId>
       <artifactId>fulcrum-parser</artifactId>
-      <version>2.0.1</version>
+      <version>3.0.0</version>
     </dependency>
     <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-pool2</artifactId>
-        <version>2.11.1</version>
+        <version>2.12.0</version>
         <scope>provided</scope>
     </dependency>
     <dependency>
@@ -128,13 +128,13 @@
     <dependency>
       <groupId>org.apache.fulcrum</groupId>
       <artifactId>fulcrum-testcontainer</artifactId>
-      <version>1.0.9</version>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.fulcrum</groupId>
       <artifactId>fulcrum-yaafi</artifactId>
-      <version>1.0.8</version>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
     <!-- log4j2 only usable in testcontainer 1.0.10 -->

src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java

diff --git a/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java b/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
index 85e6b68..b0742a5 100644
--- a/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
+++ b/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
@@ -489,6 +489,16 @@
             {
                 keyedPools.get(appData).returnObject(groupName, instance);
             }
+            catch (IllegalStateException e)
+            {
+                if (getLogger().isDebugEnabled()) {
+                    throw new IntakeException("group " + groupName + " was never borrowed or is already invalid.", e); 
+                } else { 
+                    throw new IntakeException( "group " + groupName
+                            + " was never borrowed or is already invalid (stacktrace with log-level debug): "
+                            + e.getMessage()); 
+                }
+            }
             catch (Exception e)
             {
                 throw new IntakeException("Could not get group " + groupName, e);