JDO PersistenceManager synchronization performs close attempt after completion (if necessary; SPR-8846)

Author: jhoeller

org.springframework.orm/src/main/java/org/springframework/orm/jdo/PersistenceManagerFactoryUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -323,6 +323,11 @@ protected boolean shouldUnbindAtCompletion() {
 			return this.newPersistenceManager;
 		}
 
+		@Override
+		protected boolean shouldReleaseAfterCompletion(PersistenceManagerHolder resourceHolder) {
+			return !resourceHolder.getPersistenceManager().isClosed();
+		}
+
 		@Override
 		protected void releaseResource(PersistenceManagerHolder resourceHolder, PersistenceManagerFactory resourceKey) {
 			releasePersistenceManager(resourceHolder.getPersistenceManager(), resourceKey);

org.springframework.transaction/src/main/java/org/springframework/transaction/support/ResourceHolderSynchronization.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2011 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,7 +92,7 @@ public void afterCompletion(int status) {
 				releaseNecessary = true;
 			}
 			else {
-				releaseNecessary = !shouldReleaseBeforeCompletion();
+				releaseNecessary = shouldReleaseAfterCompletion(this.resourceHolder);
 			}
 			if (releaseNecessary) {
 				releaseResource(this.resourceHolder, this.resourceKey);
@@ -128,6 +128,17 @@ protected boolean shouldReleaseBeforeCompletion() {
 		return true;
 	}
 
+	/**
+	 * Return whether this holder's resource should be released after
+	 * transaction completion (<code>true</code>).
+	 * <p>The default implementation returns <code>!shouldReleaseBeforeCompletion()</code>,
+	 * releasing after completion if no attempt was made before completion.
+	 * @see #releaseResource
+	 */
+	protected boolean shouldReleaseAfterCompletion(H resourceHolder) {
+		return !shouldReleaseBeforeCompletion();
+	}
+
 	/**
 	 * Flush callback for the given resource holder.
 	 * @param resourceHolder the resource holder to flush