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

PL-8976 NPE might occur during an attempt to fill dynamic attribute of an instance which was created before the Category

Browse Source
This commit is contained in:
Andrey Subbotin 2017-04-19 12:24:37 +04:00
parent cf4fa68b1b
commit 3f3b937a48
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/src/com/haulmont/cuba/core/app/dynamicattributes/DynamicAttributesManager.java
View File

@ -30,6 +30,7 @@ import com.haulmont.cuba.core.app.ClusterManagerAPI;
import com.haulmont.cuba.core.entity.*;
import com.haulmont.cuba.core.global.*;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.BooleanUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@ -252,7 +253,7 @@ public class DynamicAttributesManager implements DynamicAttributesManagerAPI {
//copy transient fields (for nested CAVs as well)
mergedCategoryAttributeValue.setTransientEntityValue(categoryAttributeValue.getTransientEntityValue());
mergedCategoryAttributeValue.setTransientCollectionValue(categoryAttributeValue.getTransientCollectionValue());
if (categoryAttributeValue.getCategoryAttribute().getIsCollection() && categoryAttributeValue.getChildValues() != null) {
if (BooleanUtils.isTrue(categoryAttributeValue.getCategoryAttribute().getIsCollection()) && categoryAttributeValue.getChildValues() != null) {
for (CategoryAttributeValue childCAV : categoryAttributeValue.getChildValues()) {
for (CategoryAttributeValue mergedChildCAV : mergedCategoryAttributeValue.getChildValues()) {
if (mergedChildCAV.getId().equals(childCAV.getId())) {
@ -264,7 +265,7 @@ public class DynamicAttributesManager implements DynamicAttributesManagerAPI {
}
}
if (mergedCategoryAttributeValue.getCategoryAttribute().getIsCollection()) {
if (BooleanUtils.isTrue(mergedCategoryAttributeValue.getCategoryAttribute().getIsCollection())) {
storeCategoryAttributeValueWithCollectionType(mergedCategoryAttributeValue);
}