svn commit: r449542 - /incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java

[aadamchik]

Author: aadamchik
Date: Sun Sep 24 18:59:05 2006
New Revision: 449542

URL: http://svn.apache.org/viewvc?view=rev&rev=449542
Log:
CAY-666 - nested rollback is done incorrectly

Modified:
    
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java

Modified: 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java?view=diff&rev=449542&r1=449541&r2=449542
==============================================================================
--- 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
 (original)
+++ 
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/DataContext.java
 Sun Sep 24 18:59:05 2006
@@ -1072,10 +1072,7 @@
 
     GraphDiff onContextRollback(ObjectContext originatingContext) {
         rollbackChanges();
-        return (channel != null) ? channel.onSync(
-                this,
-                null,
-                DataChannel.ROLLBACK_CASCADE_SYNC) : new CompoundDiff();
+        return new CompoundDiff();
     }
 
     GraphDiff onContextFlush(