You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2023/10/23 11:58:15 UTC
[turbine-fulcrum-intake] 02/02: 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
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-intake.git
commit 344d62ec4c640c13770dfd0f705fe1101e262b11
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Mon Oct 23 13:56:18 2023 +0200
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 | 8 ++++----
src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java | 10 ++++++++++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index eea2552d..53ae731d 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 -->
diff --git a/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java b/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
index 85e6b68f..b0742a5b 100644
--- a/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
+++ b/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
@@ -489,6 +489,16 @@ public class IntakeServiceImpl extends AbstractLogEnabled implements
{
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);