commit 9ddb492367100ebabcba687590d64618c8b82c61
author Giuseppe Gerla <giuseppe.gerla@gmail.com> Mon Mar 06 21:20:45 2017 +0000
committer Giuseppe Gerla <giuseppe.gerla@gmail.com> Mon Mar 06 21:20:45 2017 +0000
tree b68fda81f211bfc54f75c2772ebcf52219303d7d
parent 1be6d7a51116dead02c17c7b1f3c10308c8eb320

[ARIES-1689] Added check that entity manager is not null

git-svn-id: https://svn.apache.org/repos/asf/aries/trunk/jpa@1785769 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 59a5c8e..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
@@ -53,7 +53,7 @@
 
     @Override
     public Object preCall(ComponentMetadata cm, Method m, Object... parameters) throws Throwable {
-        if (coordinator == null) {
+        if (coordinator == null || em == null) {
             initServices();
         }
         try {
@@ -71,7 +71,7 @@
     }
 
     private synchronized void initServices() {
-        if (coordinator == null) {
+        if (coordinator == null || em == null) {
             coordinator = (Coordinator)container.getComponentInstance(coordinatorId);
             em = (EntityManager)container.getComponentInstance(emId);
         }