Update OrderFreightCostsService.java

avoid NPE when shipToBPartnerId is not set yet #5380
metasfresh · Jul 16, 2019 · 3afc112 · 3afc112
1 parent 5e80026
commit 3afc112
Showing 1 changed file with 3 additions and 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
@@ -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()))