svn commit: r449502 - in /incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src: cayenne/java/org/objectstyle/cayenne/access/DataContext.java tests/java/org/objectstyle/cayenne/access/DataContextSerializationTst.java

[aadamchik]

Author: aadamchik
Date: Sun Sep 24 14:58:56 2006
New Revision: 449502

URL: http://svn.apache.org/viewvc?view=rev&rev=449502
Log:
CAY-652 (1.2 branch)

Modified:
    
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/DataContext.java
    
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/tests/java/org/objectstyle/cayenne/access/DataContextSerializationTst.java

Modified: 
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/DataContext.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/DataContext.java?view=diff&rev=449502&r1=449501&r2=449502
==============================================================================
--- 
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/DataContext.java
 (original)
+++ 
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/DataContext.java
 Sun Sep 24 14:58:56 2006
@@ -418,6 +418,7 @@
      * @since 1.2
      */
     public DataChannel getChannel() {
+        awakeFromDeserialization();
         return channel;
     }
 

Modified: 
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/tests/java/org/objectstyle/cayenne/access/DataContextSerializationTst.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/tests/java/org/objectstyle/cayenne/access/DataContextSerializationTst.java?view=diff&rev=449502&r1=449501&r2=449502
==============================================================================
--- 
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/tests/java/org/objectstyle/cayenne/access/DataContextSerializationTst.java
 (original)
+++ 
incubator/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/tests/java/org/objectstyle/cayenne/access/DataContextSerializationTst.java
 Sun Sep 24 14:58:56 2006
@@ -72,6 +72,10 @@
 
     private static Logger logObj = 
Logger.getLogger(DataContextSerializationTst.class);
 
+    protected void setUp() throws Exception {
+        fixSharedConfiguration();
+    }
+
     protected void fixSharedConfiguration() {
         // for context to deserialize properly,
         // Configuration singleton must have the right default domain
@@ -85,7 +89,6 @@
     }
 
     public void testSerializeResolver() throws Exception {
-        fixSharedConfiguration();
 
         DataContext context = createDataContextWithSharedCache();
 
@@ -96,8 +99,18 @@
         assertSame(context.getEntityResolver(), 
deserializedContext.getEntityResolver());
     }
 
+    public void testSerializeChannel() throws Exception {
+
+        DataContext context = createDataContextWithSharedCache();
+
+        DataContext deserializedContext = (DataContext) Util
+                .cloneViaSerialization(context);
+
+        assertNotNull(deserializedContext.getChannel());
+        assertSame(context.getChannel(), deserializedContext.getChannel());
+    }
+
     public void testSerializeWithSharedCache() throws Exception {
-        fixSharedConfiguration();
 
         DataContext context = createDataContextWithSharedCache();
 
@@ -120,7 +133,6 @@
     }
 
     public void testSerializeWithLocalCache() throws Exception {
-        fixSharedConfiguration();
 
         DataContext context = createDataContextWithLocalCache();
 
@@ -145,7 +157,6 @@
     }
 
     public void testSerializeNew() throws Exception {
-        fixSharedConfiguration();
 
         DataContext context = createDataContextWithSharedCache();
 
@@ -172,7 +183,6 @@
     }
 
     public void testSerializeCommitted() throws Exception {
-        fixSharedConfiguration();
 
         DataContext context = createDataContextWithSharedCache();
 
@@ -214,7 +224,6 @@
     }
 
     public void testSerializeModified() throws Exception {
-        fixSharedConfiguration();
 
         DataContext context = createDataContextWithSharedCache();