From jdo-commits-return-1572-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Mon Oct 09 22:43:29 2006 Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 57540 invoked from network); 9 Oct 2006 22:43:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Oct 2006 22:43:29 -0000 Received: (qmail 34757 invoked by uid 500); 9 Oct 2006 22:43:19 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 34724 invoked by uid 99); 9 Oct 2006 22:43:19 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Oct 2006 15:43:19 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Oct 2006 15:43:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 6A4781A981A; Mon, 9 Oct 2006 15:42:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r454538 - in /db/jdo: branches/2.0.1/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java Date: Mon, 09 Oct 2006 22:42:58 -0000 To: jdo-commits@db.apache.org From: clr@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061009224258.6A4781A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: clr Date: Mon Oct 9 15:42:57 2006 New Revision: 454538 URL: http://svn.apache.org/viewvc?view=rev&rev=454538 Log: JDO-419 JDO-424 Changed state transition table to use UNSPECIFIED where the specification is unclear Modified: db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java Modified: db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java URL: http://svn.apache.org/viewvc/db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java?view=diff&rev=454538&r1=454537&r2=454538 ============================================================================== --- db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java (original) +++ db/jdo/branches/2.0.1/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java Mon Oct 9 15:42:57 2006 @@ -127,6 +127,7 @@ private static final int ERROR = -2; private static final int IMPOSSIBLE = -3; private static final int NOT_APPLICABLE = -4; + private static final int UNSPECIFIED = -5; /** * State transitions @@ -238,7 +239,7 @@ // read field with active optimistic transaction { UNCHANGED, UNCHANGED, UNCHANGED, UNCHANGED, PERSISTENT_NONTRANSACTIONAL, UNCHANGED, - UNCHANGED, ERROR, ERROR, + UNCHANGED, UNSPECIFIED, UNSPECIFIED, UNCHANGED, UNCHANGED, UNCHANGED, UNCHANGED}, @@ -251,7 +252,7 @@ // read field with active datastore transaction { UNCHANGED, UNCHANGED, UNCHANGED, UNCHANGED, PERSISTENT_CLEAN, UNCHANGED, - UNCHANGED, ERROR, ERROR, + UNCHANGED, UNSPECIFIED, UNSPECIFIED, PERSISTENT_CLEAN, UNCHANGED, UNCHANGED, UNCHANGED}, @@ -297,18 +298,18 @@ // DETACHED_DIRTY // detachCopy outside tx - { ERROR, IMPOSSIBLE, IMPOSSIBLE, - IMPOSSIBLE, UNCHANGED, IMPOSSIBLE, + { UNSPECIFIED, IMPOSSIBLE, IMPOSSIBLE, + IMPOSSIBLE, UNSPECIFIED, IMPOSSIBLE, IMPOSSIBLE, IMPOSSIBLE, IMPOSSIBLE, UNCHANGED, ERROR, UNCHANGED, UNCHANGED}, // detachCopy with active tx { PERSISTENT_NEW, UNCHANGED, UNCHANGED, - UNCHANGED, UNCHANGED, PERSISTENT_NEW, + UNCHANGED, UNSPECIFIED, PERSISTENT_NEW, PERSISTENT_NEW, ERROR, ERROR, - UNCHANGED, ERROR, UNCHANGED, - UNCHANGED}, + UNSPECIFIED, ERROR, UNSPECIFIED, + UNSPECIFIED}, // serialize outside tx { UNCHANGED, IMPOSSIBLE, IMPOSSIBLE, @@ -493,6 +494,7 @@ expected_state = transitions[operation][current_state]; if( expected_state == IMPOSSIBLE ) continue; if( expected_state == NOT_APPLICABLE ) continue; + if( expected_state == UNSPECIFIED ) continue; if( expected_state == UNCHANGED ) expected_state = current_state; try { transaction = pm.currentTransaction(); Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/lifecycle/StateTransitions.java?view=diff&rev=454538&r1=454537&r2=454538 ============================================================================== --- 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 Oct 9 15:42:57 2006 @@ -127,6 +127,7 @@ private static final int ERROR = -2; private static final int IMPOSSIBLE = -3; private static final int NOT_APPLICABLE = -4; + private static final int UNSPECIFIED = -5; /** * State transitions @@ -238,7 +239,7 @@ // read field with active optimistic transaction { UNCHANGED, UNCHANGED, UNCHANGED, UNCHANGED, PERSISTENT_NONTRANSACTIONAL, UNCHANGED, - UNCHANGED, ERROR, ERROR, + UNCHANGED, UNSPECIFIED, UNSPECIFIED, UNCHANGED, UNCHANGED, UNCHANGED, UNCHANGED}, @@ -251,7 +252,7 @@ // read field with active datastore transaction { UNCHANGED, UNCHANGED, UNCHANGED, UNCHANGED, PERSISTENT_CLEAN, UNCHANGED, - UNCHANGED, ERROR, ERROR, + UNCHANGED, UNSPECIFIED, UNSPECIFIED, PERSISTENT_CLEAN, UNCHANGED, UNCHANGED, UNCHANGED}, @@ -297,18 +298,18 @@ // DETACHED_DIRTY // detachCopy outside tx - { ERROR, IMPOSSIBLE, IMPOSSIBLE, - IMPOSSIBLE, UNCHANGED, IMPOSSIBLE, + { UNSPECIFIED, IMPOSSIBLE, IMPOSSIBLE, + IMPOSSIBLE, UNSPECIFIED, IMPOSSIBLE, IMPOSSIBLE, IMPOSSIBLE, IMPOSSIBLE, UNCHANGED, ERROR, UNCHANGED, UNCHANGED}, // detachCopy with active tx { PERSISTENT_NEW, UNCHANGED, UNCHANGED, - UNCHANGED, UNCHANGED, PERSISTENT_NEW, + UNCHANGED, UNSPECIFIED, PERSISTENT_NEW, PERSISTENT_NEW, ERROR, ERROR, - UNCHANGED, ERROR, UNCHANGED, - UNCHANGED}, + UNSPECIFIED, ERROR, UNSPECIFIED, + UNSPECIFIED}, // serialize outside tx { UNCHANGED, IMPOSSIBLE, IMPOSSIBLE, @@ -493,6 +494,7 @@ expected_state = transitions[operation][current_state]; if( expected_state == IMPOSSIBLE ) continue; if( expected_state == NOT_APPLICABLE ) continue; + if( expected_state == UNSPECIFIED ) continue; if( expected_state == UNCHANGED ) expected_state = current_state; try { transaction = pm.currentTransaction();