db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mz...@apache.org
Subject svn commit: r389247 - /db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
Date Mon, 27 Mar 2006 20:07:14 GMT
Author: mzaun
Date: Mon Mar 27 12:07:12 2006
New Revision: 389247

URL: http://svn.apache.org/viewcvs?rev=389247&view=rev
Log:
JDO-273 - fix for serialization with active datastore/optimistic tx

Modified:
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java?rev=389247&r1=389246&r2=389247&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java Mon Mar
27 12:07:12 2006
@@ -87,9 +87,10 @@
     private static final int DETACHCOPYOUTSIDETX     = 20;
     private static final int DETACHCOPYINSIDETX      = 21;
     private static final int SERIALIZEOUTSIDETX      = 22;
-    private static final int SERIALIZEINSIDETX       = 23;
+    private static final int SERIALIZEDATASTORE      = 23;
+    private static final int SERIALIZEOPTIMISTIC     = 24;
     
-    private static final int NUM_OPERATIONS          = 24;
+    private static final int NUM_OPERATIONS          = 25;
     
     private static final String[] operations = {
         "makePersistent",
@@ -115,7 +116,8 @@
         "detachCopy outside tx",
         "detachCopy with active tx",
         "serialize outside tx",
-        "serialize with active tx"
+        "serialize with active datastore tx",
+        "serialize with active optimistic tx"
     };
 
     /**
@@ -315,12 +317,19 @@
             UNCHANGED,                      UNCHANGED,                          UNCHANGED,
             UNCHANGED},
 
-        // serialize with active tx
+        // serialize with active datastore tx
         {   UNCHANGED,                      UNCHANGED,                          UNCHANGED,
             UNCHANGED,                      PERSISTENT_CLEAN,                   UNCHANGED,
             UNCHANGED,                      UNCHANGED,                          UNCHANGED,
             PERSISTENT_CLEAN,               UNCHANGED,                          UNCHANGED,
             UNCHANGED},
+
+        // serialize with active optimistic tx
+        {   UNCHANGED,                      UNCHANGED,                          UNCHANGED,
+            UNCHANGED,                      UNCHANGED,                          UNCHANGED,
+            UNCHANGED,                      UNCHANGED,                          UNCHANGED,
+            UNCHANGED,                      UNCHANGED,                          UNCHANGED,
+            UNCHANGED},
     };
 
     private static final int DATASTORE_TX = 0;
@@ -356,7 +365,8 @@
         {   false,         false,       true },   // detachCopy outside tx
         {   true,          true,        false },  // detachCopy with active tx
         {   false,         false,       true },   // serialize outside tx
-        {   true,          true,        false }   // serialize with active tx
+        {   true,          false,       false },  // serialize with active datastore tx
+        {   false,         true,        false }   // serialize with active optimistic tx
     };
 
     /**
@@ -711,7 +721,8 @@
             }
             break;      
         }
-        case SERIALIZEINSIDETX:
+        case SERIALIZEDATASTORE:
+        case SERIALIZEOPTIMISTIC:
         {
             ObjectOutputStream oos = null;
             try {



Mime
View raw message