commit f637f77f75500eb0932e48b4e421fa3a32322918
author Nicolas Dutertry <nicolas.dutertry@soprahr.com> Wed Jan 30 10:21:13 2019 +0100
committer Nicolas Dutertry <nicolas.dutertry@soprahr.com> Wed Jan 30 10:22:46 2019 +0100
tree 33e9499896e800b8e03d43a51a2c4740c48aee44
parent 6edc0d69e438218805ab96836d96817f1d3225d7

[ARIES-1885] End coordination in case of exception in JpaInterceptor

jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java

diff --git a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
index a6d5bf2..009908d 100644
--- a/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
+++ b/jpa-blueprint/src/main/java/org/apache/aries/jpa/blueprint/impl/JpaInterceptor.java
@@ -81,7 +81,9 @@
     public void postCallWithException(ComponentMetadata cm, Method m, Throwable ex, Object preCallToken) {
         LOG.debug("PostCallWithException for bean {}, method {}", cm.getId(), m.getName(), ex);
         if (preCallToken != null) {
-            ((Coordination)preCallToken).fail(ex);
+            Coordination coordination = (Coordination)preCallToken;
+            coordination.fail(ex);
+            safeEndCoordination(coordination);
         }
     }
 
@@ -90,7 +92,7 @@
         throws Exception {
         LOG.debug("PostCallWithReturn for bean {}, method {}", cm.getId(), m.getName());
         if (preCallToken != null) {
-            ((Coordination)preCallToken).end();
+            safeEndCoordination((Coordination)preCallToken);
         }
     }
 
@@ -110,4 +112,14 @@
             .get(PersistenceUnitTransactionType.class.getName());
         return transactionType == PersistenceUnitTransactionType.RESOURCE_LOCAL;
     }
+    
+    private void safeEndCoordination(final Coordination coordination) {
+        try {
+            if (coordination != null) {
+                coordination.end();
+            }
+        } catch (Exception e){
+            LOG.debug(e.getMessage(), e);
+        }
+    }
 }