BGBM BDI Projects
/
taxeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Update root entity merge calls to use new merge method.
[taxeditor.git]
/
eu.etaxonomy.taxeditor.cdmlib
/
src
/
main
/
java
/
eu
/
etaxonomy
/
taxeditor
/
session
/
CdmEntitySession.java
diff --git
a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
index 85c7d33bbaa76f044a2c33ce694ff5f3f2e94760..5fdfafa9d7b5eb46b3a89a4b42259238f42e1919 100644
(file)
--- a/
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
+++ b/
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
@@
-247,7
+247,7
@@
public class CdmEntitySession implements ICdmEntitySession {
*/
@Override
public <T extends CdmBase> T remoteUpdate(IService<T> service, T cdmBase) {
- T mergedCdmBase = service.merge(cdmBase, true);
+ T mergedCdmBase = service.merge(cdmBase, true)
.getMergedEntity()
;
return mergedCdmBase;
}