commit c936ff757029a317672a0221dfd620575cde4bd2
author Christian Schneider <chris@die-schneider.net> Tue Mar 07 05:29:55 2017 +0000
committer Christian Schneider <chris@die-schneider.net> Tue Mar 07 05:29:55 2017 +0000
tree b68fda81f211bfc54f75c2772ebcf52219303d7d
parent 70014d2e59a15004cf63b82d7d8472343ee992b5

Revert "[ARIES-1689] Fix initialization"

This was broken. Reverting to Guiseppes solution.

git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1785796 13f79535-47bb-0310-9956-ffa450edef68

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 93a37b1..a6d5bf2 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
@@ -19,7 +19,6 @@
 package org.apache.aries.jpa.blueprint.impl;
 
 import java.lang.reflect.Method;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.persistence.EntityManager;
 import javax.persistence.spi.PersistenceUnitTransactionType;
@@ -40,13 +39,11 @@
     private BlueprintContainer container;
     private String coordinatorId;
     private String emId;
-    private AtomicBoolean initialized;
 
     public JpaInterceptor(BlueprintContainer container, String coordinatorId, String emId) {
         this.container = container;
         this.coordinatorId = coordinatorId;
         this.emId = emId;
-        this.initialized = new AtomicBoolean(false);
     }
 
     @Override
@@ -56,7 +53,7 @@
 
     @Override
     public Object preCall(ComponentMetadata cm, Method m, Object... parameters) throws Throwable {
-        if (!initialized.get()) {
+        if (coordinator == null || em == null) {
             initServices();
         }
         try {
@@ -74,7 +71,7 @@
     }
 
     private synchronized void initServices() {
-        if (initialized.compareAndSet(false, true)) {
+        if (coordinator == null || em == null) {
             coordinator = (Coordinator)container.getComponentInstance(coordinatorId);
             em = (EntityManager)container.getComponentInstance(emId);
         }