cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r449414 - in /incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access: ClientServerChannel.java ServerToClientDiffConverter.java
Date Sun, 24 Sep 2006 15:28:59 GMT
Author: aadamchik
Date: Sun Sep 24 08:28:58 2006
New Revision: 449414

URL: http://svn.apache.org/viewvc?view=rev&rev=449414
Log:
CAY-666 - removing NOOP filtering of diffs returned to the client from the server on commit;
eventually this will need to be readded with the ability to pass arbitrary changes... right
now this is noop

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

Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ClientServerChannel.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ClientServerChannel.java?view=diff&rev=449414&r1=449413&r2=449414
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ClientServerChannel.java
(original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/access/ClientServerChannel.java
Sun Sep 24 08:28:58 2006
@@ -141,26 +141,13 @@
     GraphDiff onCommit(GraphDiff childDiff) {
         GraphDiff diff = serverContext.onContextFlush(null, childDiff, true);
 
-        GraphDiff returnClientDiff;
-
-        if (diff.isNoop()) {
-            returnClientDiff = diff;
-        }
-        else {
-            // create client diff
-            ServerToClientDiffConverter clientConverter = new ServerToClientDiffConverter(
-                    serverContext.getEntityResolver());
-            diff.apply(clientConverter);
-            returnClientDiff = clientConverter.getClientDiff();
-        }
-
         if (lifecycleEventsEnabled) {
             EventManager eventManager = getEventManager();
 
             if (eventManager != null) {
                 CompoundDiff notification = new CompoundDiff();
                 notification.add(childDiff);
-                notification.add(returnClientDiff);
+                notification.add(diff);
 
                 eventManager.postEvent(
                         new GraphEvent(this, notification),
@@ -168,6 +155,6 @@
             }
         }
 
-        return returnClientDiff;
+        return diff;
     }
 }



Mime
View raw message