[java-opensaml COMMIT] /trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JPAStorageService.java

[noreply at shibboleth.net]

Author: dfisher
Date: Fri Jun 13 01:26:27 2014
New Revision: 3927

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3927&view=rev
Log:
Check that the entity manager is open before closing.

Modified:
    trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JPAStorageService.java

Modified: trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JPAStorageService.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JPAStorageService.java?rev=3927&r1=3926&r2=3927&view=diff
==============================================================================
--- trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JPAStorageService.java (original)
+++ trunk/opensaml-storage-impl/src/main/java/org/opensaml/storage/impl/JPAStorageService.java Fri Jun 13 01:26:27 2014
@@ -120,7 +120,7 @@
             }
             return false;
         } finally {
-            if (manager != null) {
+            if (manager != null && manager.isOpen()) {
                 manager.close();
             }
         }
@@ -138,7 +138,7 @@
             manager = entityManagerFactory.createEntityManager();
             return executeNamedQuery(manager, "JPAStorageRecord.findAll", null, StorageRecord.class);
         } finally {
-            if (manager != null) {
+            if (manager != null && manager.isOpen()) {
                 manager.close();
             }
         }
@@ -160,7 +160,7 @@
             params.put("context", context);
             return executeNamedQuery(manager, "JPAStorageRecord.findByContext", params, StorageRecord.class);
         } finally {
-            if (manager != null) {
+            if (manager != null && manager.isOpen()) {
                 manager.close();
             }
         }
@@ -178,7 +178,7 @@
             manager = entityManagerFactory.createEntityManager();
             return executeNamedQuery(manager, "JPAStorageRecord.findAllContexts", null, String.class);
         } finally {
-            if (manager != null) {
+            if (manager != null && manager.isOpen()) {
                 manager.close();
             }
         }
@@ -233,7 +233,7 @@
             log.error("Error reading record '{}' in context '{}'", key, context, e);
             return new Pair<>();
         } finally {
-            if (manager != null) {
+            if (manager != null && manager.isOpen()) {
                 manager.close();
             }
         }
@@ -327,7 +327,7 @@
             }
             return null;
         } finally {
-            if (manager != null) {
+            if (manager != null && manager.isOpen()) {
                 manager.close();
             }
         }
@@ -390,7 +390,7 @@
             }
             return false;
         } finally {
-            if (manager != null) {
+            if (manager != null && manager.isOpen()) {
                 manager.close();
             }
         }
@@ -423,7 +423,7 @@
                 transaction.rollback();
             }
         } finally {
-            if (manager != null) {
+            if (manager != null && manager.isOpen()) {
                 manager.close();
             }
         }
@@ -478,7 +478,7 @@
                 transaction.rollback();
             }
         } finally {
-            if (manager != null) {
+            if (manager != null && manager.isOpen()) {
                 manager.close();
             }
         }