Don't NPE in case there's no packing material

#5611
metasfresh · Nov 5, 2019 · a4a68ab · a4a68ab
1 parent 97118bf
commit a4a68ab
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/....gateway.dhl/src/main/java/de/metas/shipper/gateway/dhl/DhlDraftDeliveryOrderCreator.java b/....gateway.dhl/src/main/java/de/metas/shipper/gateway/dhl/DhlDraftDeliveryOrderCreator.java
@@ -276,7 +276,17 @@ private PackageDimensions getPackageDimensions(@NonNull final Set<Integer> mpack
 				.andCollectChildren(I_M_HU_Item.COLUMN_M_HU_ID)
 				.andCollect(I_M_HU_PackingMaterial.COLUMN_M_HU_PackingMaterial_ID, I_M_HU_PackingMaterial.class)
 				.create()
-				.firstOnly(I_M_HU_PackingMaterial.class);
+				.first(I_M_HU_PackingMaterial.class);
+
+		// if there's no packing material, don't die with NPE, but return a dummy package dimensions and call it a day
+		if (packingMaterial == null)
+		{
+			return PackageDimensions.builder()
+					.heightInCM(10)
+					.lengthInCM(10)
+					.widthInCM(10)
+					.build();
+		}
 
 		final UomId uomId = UomId.ofRepoIdOrNull(packingMaterial.getC_UOM_Dimension_ID());