Revision 37d7ce64
Added by Cherian Mathew over 8 years ago
| eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java | ||
|---|---|---|
| 12 | 12 |
import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController; |
| 13 | 13 |
import eu.etaxonomy.cdm.api.application.CdmApplicationState; |
| 14 | 14 |
import eu.etaxonomy.cdm.api.service.UpdateResult; |
| 15 |
import eu.etaxonomy.cdm.persistence.dto.MergeResult; |
|
| 16 | 15 |
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager; |
| 17 | 16 |
|
| 18 | 17 |
@Component |
| ... | ... | |
| 54 | 53 |
if("merge".equals(currentRemoteInvocation.getMethodName()) ||
|
| 55 | 54 |
"save".equals(currentRemoteInvocation.getMethodName()) || |
| 56 | 55 |
"findWithUpdate".equals(currentRemoteInvocation.getMethodName())) {
|
| 57 |
if(rir.getValue() instanceof MergeResult) {
|
|
| 58 |
MergeResult result = (MergeResult) rir.getValue(); |
|
| 59 |
cdmEntitySessionManager.load(result.getMergedEntity(), true); |
|
| 60 |
cdmEntitySessionManager.load(result.getNewEntities(), true); |
|
| 61 |
} else {
|
|
| 62 |
rir = new RemoteInvocationResult(cdmEntitySessionManager.load(rir.getValue(), true)); |
|
| 63 |
} |
|
| 56 |
rir = new RemoteInvocationResult(cdmEntitySessionManager.load(rir.getValue(), true)); |
|
| 64 | 57 |
} else if(rir.getValue() instanceof UpdateResult){
|
| 65 | 58 |
UpdateResult result = (UpdateResult)rir.getValue(); |
| 66 | 59 |
if(result.isOk()){
|
Also available in: Unified diff
Add load capability for MergeResult objects