PricingResult.getDiscount() - make sure we are not returning null

#3149
metasfresh · Dec 7, 2017 · 024cae8 · 024cae8
1 parent b8c8598
commit 024cae8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/de.metas.business/src/main/java/org/adempiere/pricing/api/impl/PricingResult.java b/de.metas.business/src/main/java/org/adempiere/pricing/api/impl/PricingResult.java
@@ -69,9 +69,9 @@ class PricingResult implements IPricingResult
 
 	private boolean calculated = false;
 
-	private final List<IPricingRule> rulesApplied = new ArrayList<IPricingRule>();
+	private final List<IPricingRule> rulesApplied = new ArrayList<>();
 
-	private final List<IPricingAttribute> pricingAttributes = new ArrayList<IPricingAttribute>();
+	private final List<IPricingAttribute> pricingAttributes = new ArrayList<>();
 
 	@Override
 	public int getM_PricingSystem_ID()
@@ -211,7 +211,7 @@ public void setPriceLimit(final BigDecimal priceLimit)
 	@Override
 	public BigDecimal getDiscount()
 	{
-		return discount;
+		return discount != null ? discount : BigDecimal.ZERO;
 	}
 
 	/**