svn commit: r449538 - in /incubator/cayenne/main/trunk: assembly/cayenne-generic/src/main/resources/RELEASE-NOTES.txt core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java

[aadamchik]

Author: aadamchik
Date: Sun Sep 24 18:00:02 2006
New Revision: 449538

URL: http://svn.apache.org/viewvc?view=rev&rev=449538
Log:
CAY-653 - checking in to trunk

Modified:
    
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/resources/RELEASE-NOTES.txt
    
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java

Modified: 
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/resources/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/resources/RELEASE-NOTES.txt?view=diff&rev=449538&r1=449537&r2=449538
==============================================================================
--- 
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/resources/RELEASE-NOTES.txt
 (original)
+++ 
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/resources/RELEASE-NOTES.txt
 Sun Sep 24 18:00:02 2006
@@ -23,14 +23,17 @@
 CAY-623  Removing broken FireBird adapter
 
 Bug Fixes since 1.2 final:
-CAY-601  Problem resolving relationships in nested DataContext
-CAY-603  QueryChain.isFetchingDataRows() incorrectly returns "false" - must be 
"true" all the time
+CAY-601 Problem resolving relationships in nested DataContext
+CAY-603 QueryChain.isFetchingDataRows() incorrectly returns "false" - must be 
"true" all the time
 CAY-607        Long query name or qualifier expand query text field off screen
 CAY-639        JDBC datatype of MySQL INT UNSIGNED is mapped as 
java.lang.Integer should be java.lang.Long
 CAY-617        ROP: shared session functionality over XMPP is broken
 CAY-614        ToManyList contains references to transient objects
 CAY-609        Modeler prevents intermediate prefetch creation
 CAY-608        Prefetch validation incorrectly reports error on multi-step 
prefetches
+CAY-652 Exception with Tomcat's session restore capability
+CAY-653 overriding setPersistentState() in unreliable in three tier 
environment with CayenneContext
+
 
 API Changes
 ----------------------------------

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java?view=diff&rev=449538&r1=449537&r2=449538
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java
 Sun Sep 24 18:00:02 2006
@@ -474,9 +474,11 @@
 
         Persistent object = (Persistent) descriptor.createObject();
 
-        object.setPersistenceState(PersistenceState.NEW);
-        object.setObjectContext(this);
+        // must follow this exact order of property initialization per 
CAY-653, i.e. have
+        // the id and the context in place BEFORE setPersistence is called
         object.setObjectId(id);
+        object.setObjectContext(this);
+        object.setPersistenceState(PersistenceState.NEW);
 
         descriptor.injectValueHolders(object);
         graphManager.registerNode(object.getObjectId(), object);