You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2006/07/19 20:50:36 UTC
svn commit: r423563 -
/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteTest.java
Author: mbo
Date: Wed Jul 19 11:50:36 2006
New Revision: 423563
URL: http://svn.apache.org/viewvc?rev=423563&view=rev
Log:
JDO-395: fix cleaning up the PM in NontransactionalWriteTest
Modified:
db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteTest.java
Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteTest.java?rev=423563&r1=423562&r2=423563&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteTest.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteTest.java Wed Jul 19 11:50:36 2006
@@ -127,16 +127,19 @@
*/
protected void checkXValue(String location, int expectedXValue) {
PersistenceManager pmCheck = pmf.getPersistenceManager();
- pmCheck.currentTransaction().begin();
- VersionedPCPoint instance =
+ try {
+ pmCheck.currentTransaction().begin();
+ VersionedPCPoint instance =
(VersionedPCPoint)pmCheck.getObjectById(oid, true);
- int actualXValue = instance.getX();
- pmCheck.currentTransaction().commit();
- cleanupPM(pmCheck);
- if (expectedXValue != actualXValue) {
- appendMessage(location + NL +
- "expected: " + expectedXValue + NL +
- " actual: " + actualXValue);
+ int actualXValue = instance.getX();
+ pmCheck.currentTransaction().commit();
+ if (expectedXValue != actualXValue) {
+ appendMessage(location + NL +
+ "expected: " + expectedXValue + NL +
+ " actual: " + actualXValue);
+ }
+ } finally {
+ cleanupPM(pmCheck);
}
}
@@ -148,12 +151,15 @@
*/
protected void conflictingUpdate() {
PersistenceManager pmConflict = pmf.getPersistenceManager();
- pmConflict.currentTransaction().setOptimistic(false);
- VersionedPCPoint instance =
+ 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);
+ }
}
/**