From 3afc112c7781d04c626af0ba8621f07021019af8 Mon Sep 17 00:00:00 2001 From: Teo Sarca Date: Tue, 16 Jul 2019 20:57:16 +0300 Subject: [PATCH] Update OrderFreightCostsService.java avoid NPE when shipToBPartnerId is not set yet https://github.com/metasfresh/metasfresh/issues/5380 --- .../main/java/de/metas/order/OrderFreightCostsService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/de.metas.business/src/main/java/de/metas/order/OrderFreightCostsService.java b/de.metas.business/src/main/java/de/metas/order/OrderFreightCostsService.java index d0910fb70a1..9e47910e61f 100644 --- a/de.metas.business/src/main/java/de/metas/order/OrderFreightCostsService.java +++ b/de.metas.business/src/main/java/de/metas/order/OrderFreightCostsService.java @@ -196,7 +196,9 @@ private FreightCostContext extractFreightCostContext(final I_C_Order order) final FreightCostRule freightCostRule = FreightCostRule.ofNullableCodeOr(order.getFreightCostRule(), FreightCostRule.FreightIncluded); final ShipperId orderShipperid = ShipperId.ofRepoIdOrNull(order.getM_Shipper_ID()); - final ShipperId partnerShipperId = bpartnerBL.getShipperIdOrNull(shipToBPartnerId); + final ShipperId partnerShipperId = shipToBPartnerId != null + ? bpartnerBL.getShipperIdOrNull(shipToBPartnerId) + : null; return FreightCostContext.builder() .shipFromOrgId(OrgId.ofRepoId(order.getC_Order_ID()))