Skip to content

Commit e6a01c3

Browse files
Merge pull request BroadleafCommerce#215 from BroadleafCommerce/qa-1291-offer-domain-extensions
Fixed NPE when extending Offer domain entity
2 parents f00d993 + c693016 commit e6a01c3

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/web/controller/entity/AdminOfferController.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ public String addEntity(HttpServletRequest request, HttpServletResponse response
9999
*/
100100
protected void modifyModelAttributes(Model model) {
101101
model.addAttribute("additionalControllerClasses", "offer-form");
102-
EntityForm form = (EntityForm) model.asMap().get("entityForm");
103-
form.findField("targetItemCriteria").setRequired(true);
102+
if (model.asMap().containsKey("entityForm")) {
103+
EntityForm form = (EntityForm) model.asMap().get("entityForm");
104+
form.findField("targetItemCriteria").setRequired(true);
105+
}
104106
}
105107

106108
}

0 commit comments

Comments
 (0)