test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 03:38:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-8871 Error on saving entity if cross-datastore reference was not loaded

Browse Source
This commit is contained in:
Konstantin Krivopustov 2017-03-30 09:57:46 +04:00
parent fd0b598965
commit d22c067a77
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
modules/core/src/com/haulmont/cuba/core/app/DataManagerBean.java
View File

@ -296,31 +296,33 @@ public class DataManagerBean implements DataManager {
continue;
}
String relatedPropertyName = relatedProperties.get(0);
Entity refEntity = entity.getValue(property.getName());
if (refEntity == null) {
entity.setValue(relatedPropertyName, null);
} else {
Object refEntityId = refEntity.getId();
if (refEntityId instanceof IdProxy) {
Long realId = ((IdProxy) refEntityId).get();
if (realId == null) {
if (allEntities.stream().anyMatch(e -> e.getId().equals(refEntityId))) {
repeatRequired = true;
if (PersistenceHelper.isLoaded(entity, relatedPropertyName)) {
Entity refEntity = entity.getValue(property.getName());
if (refEntity == null) {
entity.setValue(relatedPropertyName, null);
} else {
Object refEntityId = refEntity.getId();
if (refEntityId instanceof IdProxy) {
Long realId = ((IdProxy) refEntityId).get();
if (realId == null) {
if (allEntities.stream().anyMatch(e -> e.getId().equals(refEntityId))) {
repeatRequired = true;
} else {
log.warn("No entity with ID={} in the context, skip handling different data store", refEntityId);
}
} else {
log.warn("No entity with ID={} in the context, skip handling different data store", refEntityId);
entity.setValue(relatedPropertyName, realId);
}
} else if (refEntityId instanceof EmbeddableEntity) {
MetaProperty relatedProperty = metaClass.getPropertyNN(relatedPropertyName);
if (!relatedProperty.getRange().isClass()) {
log.warn("PK of entity referenced by {} is a EmbeddableEntity, but related property {} is not", property, relatedProperty);
} else {
entity.setValue(relatedPropertyName, metadataTools.copy((Entity) refEntityId));
}
} else {
entity.setValue(relatedPropertyName, realId);
entity.setValue(relatedPropertyName, refEntityId);
}
} else if (refEntityId instanceof EmbeddableEntity) {
MetaProperty relatedProperty = metaClass.getPropertyNN(relatedPropertyName);
if (!relatedProperty.getRange().isClass()) {
log.warn("PK of entity referenced by {} is a EmbeddableEntity, but related property {} is not", property, relatedProperty);
} else {
entity.setValue(relatedPropertyName, metadataTools.copy((Entity) refEntityId));
}
} else {
entity.setValue(relatedPropertyName, refEntityId);
}
}
}