Diff of /cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushAction.java

Parent Directory | Revision Log | Patch

--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushAction.java	2007/05/07 16:06:56	535915
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/access/DataDomainFlushAction.java	2007/05/07 16:13:27	535916
@@ -128,24 +128,23 @@ class DataDomainFlushAction {
         this.flattenedBucket = new DataDomainFlattenedBucket(this);
 
         this.queries = new ArrayList();
+        this.resultIndirectlyModifiedIds = new HashSet();
 
-        // note that there is no syncing on the object store itself. This is caller's
-        // responsibility.
-        synchronized (context.getObjectStore().getDataRowCache()) {
-
-            this.resultIndirectlyModifiedIds = new HashSet();
+        preprocess(context, changes);
 
-            preprocess(context, changes);
+        if (queries.isEmpty()) {
+            return new CompoundDiff();
+        }
 
-            if (queries.isEmpty()) {
-                return new CompoundDiff();
-            }
+        this.resultDiff = new CompoundDiff();
+        this.resultDeletedIds = new ArrayList();
+        this.resultModifiedSnapshots = new HashMap();
 
-            this.resultDiff = new CompoundDiff();
-            this.resultDeletedIds = new ArrayList();
-            this.resultModifiedSnapshots = new HashMap();
+        runQueries();
 
-            runQueries();
+        // note that there is no syncing on the object store itself. This is caller's
+        // responsibility.
+        synchronized (context.getObjectStore().getDataRowCache()) {
             postprocess(context);
             return resultDiff;
         }