Author: mcaisse
Date: Mon Jun 13 14:30:45 2005
New Revision: 190510
URL: http://svn.apache.org/viewcvs?rev=190510&view=rev
Log:
Undo 190507 -- wrong patch for JDO-59
Modified:
incubator/jdo/trunk/tck20/test/conf/alltests.list
incubator/jdo/trunk/tck20/test/conf/exclude.list
incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithArraySideEffects.java
incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithCollectionSideEffects.java
incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java
Modified: incubator/jdo/trunk/tck20/test/conf/alltests.list
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/alltests.list?rev=190510&r1=190509&r2=190510&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/alltests.list (original)
+++ incubator/jdo/trunk/tck20/test/conf/alltests.list Mon Jun 13 14:30:45 2005
@@ -125,10 +125,6 @@
org.apache.jdo.tck.api.persistencemanager.cache.PassingNullToEvictHasNoEffect \
org.apache.jdo.tck.api.persistencemanager.cache.PassingNullToRefreshAllThrowsException \
org.apache.jdo.tck.api.persistencemanager.cache.PassingNullToRefreshHasNoEffect \
-org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllNoParameterSideEffects \
-org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllWithArraySideEffects \
-org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllWithCollectionSideEffects \
-org.apache.jdo.tck.api.persistencemanager.cache.RefreshSideEffects \
org.apache.jdo.tck.api.persistencemanager.cache.Retrieve \
org.apache.jdo.tck.api.persistencemanager.SameTransactionInstanceForAllCallsToCurrentTransaction
\
org.apache.jdo.tck.api.persistencemanager.flags.SetIgnoreCacheToFalse \
Modified: incubator/jdo/trunk/tck20/test/conf/exclude.list
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/exclude.list?rev=190510&r1=190509&r2=190510&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/exclude.list (original)
+++ incubator/jdo/trunk/tck20/test/conf/exclude.list Mon Jun 13 14:30:45 2005
@@ -1,3 +1,8 @@
jdo.tck.exclude = \
org.apache.jdo.tck.enhancement.FieldAccessModified \
-org.apache.jdo.tck.enhancement.ImplementsPersistenceCapable
+org.apache.jdo.tck.enhancement.ImplementsPersistenceCapable \
+org.apache.jdo.tck.lifecycle.PMsCanSharePCClassesButNotPCInstances \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllNoParameterSideEffects \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllWithArraySideEffects \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshAllWithCollectionSideEffects \
+org.apache.jdo.tck.api.persistencemanager.cache.RefreshSideEffects
Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java?rev=190510&r1=190509&r2=190510&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
(original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
Mon Jun 13 14:30:45 2005
@@ -54,9 +54,6 @@
/** */
static final int DELAY = 100;
- /** This object is used for synchronizing concurrent makePersistentAll calls. */
- private static final Object synchronizationObject = new Object();
-
/**
* The <code>main</code> is called when the class
* is directly executed from the command line.
@@ -169,9 +166,7 @@
col1.add(n1);
col1.add(n2);
- synchronized (synchronizationObject) {
- pm.makePersistentAll(col1);
- }
+ pm.makePersistentAll(col1);
pm.refreshAll();
RefreshAllNoParameterSideEffects.this.logger.debug(
@@ -192,7 +187,6 @@
" ThreadT1: commit finished.");
}
finally {
- commitDone = true;
if ((tx != null) && tx.isActive())
tx.rollback();
}
@@ -238,10 +232,7 @@
Collection col1 = new HashSet();
col1.add(p1);
col1.add(p2);
-
- synchronized (synchronizationObject) {
- pm.makePersistentAll(col1);
- }
+ pm.makePersistentAll(col1);
pm.refreshAll();
done = true;
@@ -262,7 +253,6 @@
" ThreadT2: commit finished.");
}
finally {
- done = true;
if ((tx != null) && tx.isActive())
tx.rollback();
}
Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithArraySideEffects.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithArraySideEffects.java?rev=190510&r1=190509&r2=190510&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithArraySideEffects.java
(original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithArraySideEffects.java
Mon Jun 13 14:30:45 2005
@@ -55,9 +55,6 @@
/** */
static final int DELAY = 100;
- /** This object is used for synchronizing concurrent makePersistentAll calls. */
- private static final Object synchronizationObject = new Object();
-
/**
* The <code>main</code> is called when the class
* is directly executed from the command line.
@@ -158,14 +155,12 @@
tx.begin();
n1.setX(500);
n2.setX(501);
-
+
Collection col1 = new HashSet();
col1.add(n1);
col1.add(n2);
-
- synchronized (synchronizationObject) {
- pm.makePersistentAll(col1);
- }
+
+ pm.makePersistentAll(col1);
pm.refreshAll(col1.toArray());
RefreshAllWithArraySideEffects.this.logger.debug(
" ThreadT1: waiting for ThreadT2.done");
@@ -186,7 +181,6 @@
" ThreadT1: commit finished.");
}
finally {
- commitDone = true;
if ((tx != null) && tx.isActive())
tx.rollback();
}
@@ -228,20 +222,16 @@
tx.begin();
p1.setX(200);
p2.setX(201);
-
+
Collection col1 = new HashSet();
col1.add(p1);
col1.add(p2);
-
- synchronized (synchronizationObject) {
- pm.makePersistentAll(col1);
- }
+ pm.makePersistentAll(col1);
pm.refreshAll(col1.toArray());
done = true;
-
+
RefreshAllWithArraySideEffects.this.logger.debug(
" ThreadT2: waiting for commit of ThreadT1");
-
while (!other.isCommitDone()) {
try {
Thread.sleep(DELAY);
@@ -256,7 +246,6 @@
" ThreadT2: commit finished.");
}
finally {
- done = true;
if ((tx != null) && tx.isActive())
tx.rollback();
}
Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithCollectionSideEffects.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithCollectionSideEffects.java?rev=190510&r1=190509&r2=190510&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithCollectionSideEffects.java
(original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithCollectionSideEffects.java
Mon Jun 13 14:30:45 2005
@@ -55,9 +55,6 @@
/** */
static final int DELAY = 100;
- /** This object is used for synchronizing concurrent makePersistentAll calls. */
- private static final Object synchronizationObject = new Object();
-
/**
* The <code>main</code> is called when the class
* is directly executed from the command line.
@@ -163,9 +160,7 @@
col1.add(n1);
col1.add(n2);
- synchronized (synchronizationObject) {
- pm.makePersistentAll(col1);
- }
+ pm.makePersistentAll(col1);
pm.refreshAll(col1);
RefreshAllWithCollectionSideEffects.this.logger.debug(
" ThreadT1: waiting for ThreadT2.done");
@@ -186,7 +181,6 @@
" ThreadT1: commit finished.");
}
finally {
- commitDone = true;
if ((tx != null) && tx.isActive())
tx.rollback();
}
@@ -231,9 +225,7 @@
Collection col1 = new HashSet();
col1.add(p1);
col1.add(p2);
- synchronized (synchronizationObject) {
- pm.makePersistentAll(col1);
- }
+ pm.makePersistentAll(col1);
pm.refreshAll(col1);
done = true;
@@ -253,7 +245,6 @@
" ThreadT2: commit finished.");
}
finally {
- done = true;
if ((tx != null) && tx.isActive())
tx.rollback();
}
Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java?rev=190510&r1=190509&r2=190510&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java
(original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java
Mon Jun 13 14:30:45 2005
@@ -51,9 +51,6 @@
/** */
static final int DELAY = 100;
- /** This object is used for synchronizing concurrent makePersistentAll calls. */
- private static final Object synchronizationObject = new Object();
-
/**
* The <code>main</code> is called when the class
* is directly executed from the command line.
@@ -153,9 +150,7 @@
RefreshSideEffects.this.logger.debug(" ThreadT1: START");
tx.begin();
n1.setX(500);
- synchronized (synchronizationObject) {
- pm.makePersistent(n1);
- }
+ pm.makePersistent(n1);
pm.refresh(n1);
RefreshSideEffects.this.logger.debug(
@@ -176,7 +171,6 @@
" ThreadT1: commit finished.");
}
finally {
- commitDone = true;
if ((tx != null) && tx.isActive())
tx.rollback();
}
@@ -216,9 +210,7 @@
RefreshSideEffects.this.logger.debug(" ThreadT2: START");
tx.begin();
p1.setX(201);
- synchronized (synchronizationObject) {
- pm.makePersistent(p1);
- }
+ pm.makePersistent(p1);
pm.refresh(p1);
done = true;
@@ -238,7 +230,6 @@
" ThreadT2: commit finished.");
}
finally {
- done = true;
if ((tx != null) && tx.isActive())
tx.rollback();
}
|