svn commit: r420170 - /incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/ObjectResolver.java

[aadamchik]

Author: aadamchik
Date: Sat Jul  8 10:41:25 2006
New Revision: 420170

URL: http://svn.apache.org/viewvc?rev=420170&view=rev
Log:
CAY-592 - refactoring - no changes

Modified:
    
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/ObjectResolver.java

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/ObjectResolver.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/ObjectResolver.java?rev=420170&r1=420169&r2=420170&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/ObjectResolver.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/access/ObjectResolver.java
 Sat Jul  8 10:41:25 2006
@@ -243,9 +243,11 @@
             case PersistenceState.MODIFIED:
             case PersistenceState.DELETED:
                 // process the above only if refresh is requested...
-                if (!refreshObjects) {
-                    break;
+                if (refreshObjects) {
+                    DataRowUtils.mergeObjectWithSnapshot(objectEntity, object, 
row);
+                    object.setSnapshotVersion(row.getVersion());
                 }
+                break;
             case PersistenceState.HOLLOW:
                 if(!refreshObjects) {
                     DataRow cachedRow = cache.getCachedSnapshot(anId);
@@ -255,6 +257,7 @@
                 }
                 DataRowUtils.mergeObjectWithSnapshot(objectEntity, object, 
row);
                 object.setSnapshotVersion(row.getVersion());
+                break;
             default:
                 break;
         }