Project

General

Profile

« Previous | Next » 

Revision 6c95dd3d

Added by Cherian Mathew over 8 years ago

Update root entity merge calls to use new merge method.

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java
63 63
	@Override
64 64
	public User save(User entity) {
65 65
	    if(CdmStore.getCurrentSessionManager().isRemoting()) {
66
	        return CdmStore.getService(IUserService.class).merge(entity, true);
66
	        return CdmStore.getService(IUserService.class).merge(entity, true).getMergedEntity();
67 67
	    } else {
68 68
	        CdmStore.getService(IUserService.class).saveOrUpdate(entity);
69 69
	        return entity;

Also available in: Unified diff