You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2009/09/15 20:47:03 UTC
svn commit: r815444 - in /cayenne/main/trunk: docs/doc/src/main/resources/
framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/
framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/
Author: aadamchik
Date: Tue Sep 15 18:47:02 2009
New Revision: 815444
URL: http://svn.apache.org/viewvc?rev=815444&view=rev
Log:
CAY-1277 Prefetching may cause a root object to got from COMMITTED to MODIFIED state
Modified:
cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorNode.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java
Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=815444&r1=815443&r2=815444&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Tue Sep 15 18:47:02 2009
@@ -48,6 +48,7 @@
CAY-1265 error while search inheritance relationship
CAY-1274 CreateTableToDb should not create existing AUTO_PK_SUPPORT
CAY-1275 Merge set-not-null to Oracle through modeler fails if auto adapter is set
+CAY-1277 Prefetching may cause a root object to got from COMMITTED to MODIFIED state
----------------------------------
Release: 3.0M6
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorNode.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorNode.java?rev=815444&r1=815443&r2=815444&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorNode.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/PrefetchProcessorNode.java Tue Sep 15 18:47:02 2009
@@ -138,7 +138,7 @@
while (it.hasNext()) {
Object object = it.next();
if (incoming.readPropertyDirectly(object) instanceof Fault) {
- incoming.writeProperty(object, null, null);
+ incoming.writePropertyDirectly(object, null, null);
}
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java?rev=815444&r1=815443&r2=815444&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextPrefetchTest.java Tue Sep 15 18:47:02 2009
@@ -464,6 +464,9 @@
// testing null to-one target
Painting p4 = (Painting) results.get(3);
assertNull(p4.readPropertyDirectly(Painting.TO_PAINTING_INFO_PROPERTY));
+
+ // there was a bug marking an object as dirty when clearing the relationships
+ assertEquals(PersistenceState.COMMITTED, p4.getPersistenceState());
}
finally {
unblockQueries();