svn commit: r1704651 - in /aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl: ResourceLocalJpaTemplate.java XAJpaTemplate.java

[cs...@apache.org]

Author: cschneider
Date: Tue Sep 22 15:13:26 2015
New Revision: 1704651

URL: http://svn.apache.org/viewvc?rev=1704651&view=rev
Log:
[ARIES-1415] Some more fixes

Modified:
    aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/ResourceLocalJpaTemplate.java
    aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/XAJpaTemplate.java

Modified: aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/ResourceLocalJpaTemplate.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/ResourceLocalJpaTemplate.java?rev=1704651&r1=1704650&r2=1704651&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/ResourceLocalJpaTemplate.java (original)
+++ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/ResourceLocalJpaTemplate.java Tue Sep 22 15:13:26 2015
@@ -25,8 +25,11 @@ import org.apache.aries.jpa.template.EmF
 import org.apache.aries.jpa.template.TransactionType;
 import org.osgi.service.coordinator.Coordination;
 import org.osgi.service.coordinator.Coordinator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ResourceLocalJpaTemplate extends AbstractJpaTemplate {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResourceLocalJpaTemplate.class);
     private EmSupplier emSupplier;
     private Coordinator coordinator;
 
@@ -70,6 +73,7 @@ public class ResourceLocalJpaTemplate ex
             try {
                 em.getTransaction().rollback();
             } catch (Exception e1) {
+                LOGGER.warn("Exception during transaction rollback", e1);
             }
         }
     }

Modified: aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/XAJpaTemplate.java
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/XAJpaTemplate.java?rev=1704651&r1=1704650&r2=1704651&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/XAJpaTemplate.java (original)
+++ aries/trunk/jpa/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/XAJpaTemplate.java Tue Sep 22 15:13:26 2015
@@ -66,11 +66,12 @@ public class XAJpaTemplate extends Abstr
         } finally {
             try {
                 ta.finish(tm, tranToken);
-                coord.end();
             } catch (Exception e) {
                 // We are throwing an exception, so we don't error it out
-                LOGGER.debug("exception.during.tx.finish", e);
+                LOGGER.debug("Exception during finish of transaction", e);
                 throw new RuntimeException("Exception during finish of transaction", e);
+            } finally {
+                coord.end();
             }
         }
     }
@@ -88,7 +89,7 @@ public class XAJpaTemplate extends Abstr
         } catch (Exception e) {
             // we do not throw the exception since there already is one, but we
             // need to log it
-            LOGGER.warn("exception.during.tx.cleanup", e);
+            LOGGER.warn("Exception during transaction rollback", e);
         }
     }