提交 2ae8aff6 编写于 作者: S Serge Rider

Nested attributes update fix

上级 1e9b74d9
...@@ -46,7 +46,7 @@ public abstract class DBDAttributeBindingNested extends DBDAttributeBinding impl ...@@ -46,7 +46,7 @@ public abstract class DBDAttributeBindingNested extends DBDAttributeBinding impl
return parent.getDataSource(); return parent.getDataSource();
} }
@Nullable @NotNull
public DBDAttributeBinding getParentObject() { public DBDAttributeBinding getParentObject() {
return parent; return parent;
} }
...@@ -61,14 +61,12 @@ public abstract class DBDAttributeBindingNested extends DBDAttributeBinding impl ...@@ -61,14 +61,12 @@ public abstract class DBDAttributeBindingNested extends DBDAttributeBinding impl
@Override @Override
public boolean isReadOnly() { public boolean isReadOnly() {
assert parent != null;
return parent.getMetaAttribute().isReadOnly(); return parent.getMetaAttribute().isReadOnly();
} }
@Nullable @Nullable
@Override @Override
public DBCEntityMetaData getEntityMetaData() { public DBCEntityMetaData getEntityMetaData() {
assert parent != null;
return parent.getMetaAttribute().getEntityMetaData(); return parent.getMetaAttribute().getEntityMetaData();
} }
...@@ -77,7 +75,6 @@ public abstract class DBDAttributeBindingNested extends DBDAttributeBinding impl ...@@ -77,7 +75,6 @@ public abstract class DBDAttributeBindingNested extends DBDAttributeBinding impl
*/ */
@Nullable @Nullable
public DBDRowIdentifier getRowIdentifier() { public DBDRowIdentifier getRowIdentifier() {
assert parent != null;
return parent.getRowIdentifier(); return parent.getRowIdentifier();
} }
......
...@@ -389,6 +389,9 @@ public class ResultSetModel { ...@@ -389,6 +389,9 @@ public class ResultSetModel {
log.warn("Attribute '" + ownerAttr.getName() + "' has collection type but attribute value is not a collection: " + nestedValue); log.warn("Attribute '" + ownerAttr.getName() + "' has collection type but attribute value is not a collection: " + nestedValue);
} }
} }
if (ownerValue instanceof DBDComposite) {
((DBDComposite) ownerValue).setAttributeValue(ownerAttr, nestedValue);
}
} }
ownerValue = nestedValue; ownerValue = nestedValue;
} catch (DBCException e) { } catch (DBCException e) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册