Skip to content

Commit 47f42e7

Browse files
brianikimbrianchandotcom
authored andcommitted
LPD-58531 Add null check and use master configuration entry if it exists
1 parent b0701f0 commit 47f42e7

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/order/DefaultCommerceOrderValidatorImpl.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ public CommerceOrderValidatorResult validate(
9797
_classNameLocalService.getClassNameId(CPDefinition.class),
9898
cpInstance.getCPDefinitionId(), cpConfigurationListId);
9999

100+
if (cpConfigurationEntry == null) {
101+
CPDefinition cpDefinition = cpInstance.getCPDefinition();
102+
103+
cpConfigurationEntry =
104+
cpDefinition.fetchMasterCPConfigurationEntry();
105+
}
106+
100107
cpDefinitionInventoryEngine =
101108
_cpDefinitionInventoryEngineRegistry.
102109
getCPDefinitionInventoryEngine(
@@ -206,6 +213,13 @@ public CommerceOrderValidatorResult validate(
206213
_classNameLocalService.getClassNameId(CPDefinition.class),
207214
cpInstance.getCPDefinitionId(), cpConfigurationListId);
208215

216+
if (cpConfigurationEntry == null) {
217+
CPDefinition cpDefinition = cpInstance.getCPDefinition();
218+
219+
cpConfigurationEntry =
220+
cpDefinition.fetchMasterCPConfigurationEntry();
221+
}
222+
209223
cpDefinitionInventoryEngine =
210224
_cpDefinitionInventoryEngineRegistry.
211225
getCPDefinitionInventoryEngine(

0 commit comments

Comments
 (0)