google#731 Fix nested Transactional annotations

andresviedma · Dec 31, 2015 · 3a1d520 · 3a1d520
1 parent 51215c3
commit 3a1d520
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/extensions/persist/src/com/google/inject/persist/jpa/JpaLocalTxnInterceptor.java b/extensions/persist/src/com/google/inject/persist/jpa/JpaLocalTxnInterceptor.java
@@ -48,7 +48,11 @@ public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 
     // Allow 'joining' of transactions if there is an enclosing @Transactional method.
     if (em.getTransaction().isActive()) {
-      return methodInvocation.proceed();
+      try {
+        return methodInvocation.proceed();
+      } finally {
+        unitOfWorkHandler.endRequireUnitOfWork();
+      }
     }
 
     final EntityTransaction txn = em.getTransaction();