X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fpersistence%2FJpaMergeSupport.java;fp=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fpersistence%2FJpaMergeSupport.java;h=4254dad6649820ad5c8d2ee295c245ec2e40e09e;hb=dfc547c60bdd4cdaf9da202e0af4494c782437e7;hp=6230656f0f3933a37a879849ded6418c62c83d46;hpb=a38ca9413f4b847116039c9005fec10092350dc8;p=utils

diff --git a/support/general/src/main/java/org/wamblee/persistence/JpaMergeSupport.java b/support/general/src/main/java/org/wamblee/persistence/JpaMergeSupport.java
index 6230656f..4254dad6 100644
--- a/support/general/src/main/java/org/wamblee/persistence/JpaMergeSupport.java
+++ b/support/general/src/main/java/org/wamblee/persistence/JpaMergeSupport.java
@@ -29,7 +29,6 @@ import javax.persistence.EntityManager;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wamblee.persistence.PersistentFactory.EntityAccessor;
 import org.wamblee.reflection.ReflectionUtils;
 
 /**
@@ -140,11 +139,10 @@ public class JpaMergeSupport {
             throw new IllegalArgumentException(
                 "Mismatch between primary key values: " + aPersistent + " " +
                     aMerged);
-        } else {
-            persistentWrapper.setPersistedVersion(mergedWrapper
-                .getPersistedVersion());
-            persistentWrapper.setPrimaryKey(mergedWrapper.getPrimaryKey());
         }
+        persistentWrapper.setPersistedVersion(mergedWrapper
+            .getPersistedVersion());
+        persistentWrapper.setPrimaryKey(mergedWrapper.getPrimaryKey());
 
         List<Method> methods = ReflectionUtils.getAllMethods(aPersistent
             .getClass(), Object.class);