Index: .
===================================================================
--- .	(revision 1728)
+++ .	(working copy)
@@ -147,13 +147,16 @@
      * persistence manager.
      */
     protected void conflictingUpdate() {
-        PersistenceManager pmConflict = pmf.getPersistenceManager();
-        pmConflict.currentTransaction().setOptimistic(false);
-        VersionedPCPoint instance = 
+    	PersistenceManager pmConflict = pmf.getPersistenceManager();
+    	try {
+    		pmConflict.currentTransaction().setOptimistic(false);
+    		VersionedPCPoint instance = 
                 (VersionedPCPoint)pmConflict.getObjectById(oid);
-        instance.setX(conflictXValue);
-        pmConflict.currentTransaction().commit();
-        cleanupPM(pmConflict);
+    		instance.setX(conflictXValue);
+    		pmConflict.currentTransaction().commit();
+    	} finally {
+            cleanupPM(pmConflict);
+    	}
     }
 
     /**