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 2007/03/29 11:36:14 UTC
svn commit: r523652 -
/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/CayenneContextMergeHandler.java
Author: aadamchik
Date: Thu Mar 29 02:36:13 2007
New Revision: 523652
URL: http://svn.apache.org/viewvc?view=rev&rev=523652
Log:
CAY-771CayenneContext.rollbackChanges (client-side) is marking objects in other contexts as transient!
(fixing local peer handling on rollback - the most important case... leaving the remote peer handling out for now).
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/CayenneContextMergeHandler.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/CayenneContextMergeHandler.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/CayenneContextMergeHandler.java?view=diff&rev=523652&r1=523651&r2=523652
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/CayenneContextMergeHandler.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/CayenneContextMergeHandler.java Thu Mar 29 02:36:13 2007
@@ -95,21 +95,9 @@
public void graphRolledback(final GraphEvent e) {
- if (shouldProcessEvent(e)) {
-
- // do we need to merge anything?
- if (context.internalGraphManager().hasChanges()) {
- runWithEventsDisabled(new Runnable() {
-
- public void run() {
- context.internalGraphManager().graphReverted();
- }
- });
-
- // post event outside of "execute" to make sure it is sent
- repostAfterMerge(e);
- }
- }
+ // TODO: andrus, 3/29/2007: per CAY-771, if a LOCAL peer context posted the event,
+ // just ignore it, however if the REMOTE peer reverted the parent remote
+ // DataContext, we need to invalidate stale committed objects...
}
// ******* End DataChannelListener methods *******