You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by an...@apache.org on 2010/03/05 12:14:07 UTC
svn commit: r919377 - in /cayenne/main/branches/STABLE-3.0:
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: andrey
Date: Fri Mar 5 11:14:06 2010
New Revision: 919377
URL: http://svn.apache.org/viewvc?rev=919377&view=rev
Log:
CAY-1400 lazyInitParentDomainName will become null when using Child Context
Modified:
cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java
cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java
Modified: cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=919377&r1=919376&r2=919377&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/branches/STABLE-3.0/docs/doc/src/main/resources/RELEASE-NOTES.txt Fri Mar 5 11:14:06 2010
@@ -23,6 +23,7 @@
CAY-1390 DataRowStore.processRemoteEvent processInvalidatedIDs typo
CAY-1396 merge: unneeded cast to SQLServerAdapter
CAY-1397 ROP: Missing the COMMIT state when deleting HOLLOW object
+CAY-1400 lazyInitParentDomainName will become null when using Child Context
----------------------------------
Release: 3.0 RC 2
Modified: cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java?rev=919377&r1=919376&r2=919377&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java Fri Mar 5 11:14:06 2010
@@ -1428,7 +1428,8 @@
Object value = in.readObject();
if (value instanceof DataChannel) {
// A real QueryEngine object - use it
- this.channel = (DataChannel) value;
+ // call a setter to initialize EntityResolver
+ setChannel((DataChannel) value);
}
else if (value instanceof String) {
// The name of a DataDomain - use it
Modified: cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java?rev=919377&r1=919376&r2=919377&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextSerializationTest.java Fri Mar 5 11:14:06 2010
@@ -23,6 +23,7 @@
import org.apache.art.Artist;
import org.apache.cayenne.DataObjectUtils;
+import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.conf.Configuration;
import org.apache.cayenne.unit.CayenneCase;
@@ -71,6 +72,16 @@
assertNotNull(deserializedContext.getChannel());
assertSame(context.getChannel(), deserializedContext.getChannel());
}
+
+ public void testSerializeNestedChannel() throws Exception {
+ DataContext context = createDataContextWithSharedCache();
+ ObjectContext child = context.createChildContext();
+
+ ObjectContext deserializedContext = (ObjectContext) Util.cloneViaSerialization(child);
+
+ assertNotNull(deserializedContext.getChannel());
+ assertNotNull(deserializedContext.getEntityResolver());
+ }
public void testSerializeWithSharedCache() throws Exception {