You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2019/02/11 09:19:07 UTC

[aries-jpa] branch master updated: Small simplification

This is an automated email from the ASF dual-hosted git repository.

cschneider pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jpa.git


The following commit(s) were added to refs/heads/master by this push:
     new eec577b  Small simplification
eec577b is described below

commit eec577b99ed9b8c8d7071443cfc952735e6a6f2a
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Mon Feb 11 10:18:59 2019 +0100

    Small simplification
---
 .../main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java b/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java
index 36942ad..e338659 100644
--- a/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java
+++ b/jpa-support/src/main/java/org/apache/aries/jpa/support/impl/EMSupplierImpl.java
@@ -108,10 +108,7 @@ public class EMSupplierImpl implements EmSupplier {
             setEm(coordination, em);
             coordination.addParticipant(new EmShutDownParticipant());
         }
-        else {
-            if (tmTracker == null) {
-                return em;
-            }
+        else if (tmTracker != null) {
             TransactionManager tm = tmTracker.getService();
             if (tm == null) {
                 LOG.warn("Transaction manager is not available.");