git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
support
/
general
/
src
/
main
/
java
/
org
/
wamblee
/
persistence
/
JpaMergeSupport.java
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 6230656f0f3933a37a879849ded6418c62c83d46..4254dad6649820ad5c8d2ee295c245ec2e40e09e 100644
(file)
--- 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.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.wamblee.persistence.PersistentFactory.EntityAccessor;
import org.wamblee.reflection.ReflectionUtils;
/**
import org.wamblee.reflection.ReflectionUtils;
/**
@@
-140,11
+139,10
@@
public class JpaMergeSupport {
throw new IllegalArgumentException(
"Mismatch between primary key values: " + aPersistent + " " +
aMerged);
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);
List<Method> methods = ReflectionUtils.getAllMethods(aPersistent
.getClass(), Object.class);