From: Andreas Beeker Date: Tue, 1 Nov 2016 10:52:20 +0000 (+0000) Subject: Handle null returns of coerceValueToBoolean X-Git-Tag: REL_3_16_BETA1~27 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ffe1c408f8c0d81639b11b4452da4873924e36ac;p=poi.git Handle null returns of coerceValueToBoolean git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1767474 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed.java b/src/java/org/apache/poi/ss/formula/functions/Fixed.java index d9026dcc73..e18bb062ea 100644 --- a/src/java/org/apache/poi/ss/formula/functions/Fixed.java +++ b/src/java/org/apache/poi/ss/formula/functions/Fixed.java @@ -92,7 +92,7 @@ public final class Fixed implements Function1Arg, Function2Arg, Function3Arg { // Format number conditionally using a thousands separator. NumberFormat nf = NumberFormat.getNumberInstance(Locale.US); DecimalFormat formatter = (DecimalFormat)nf; - formatter.setGroupingUsed(! skipThousandsSeparator); + formatter.setGroupingUsed(!(skipThousandsSeparator != null && skipThousandsSeparator)); formatter.setMinimumFractionDigits(places >= 0 ? places : 0); formatter.setMaximumFractionDigits(places >= 0 ? places : 0); String numberString = formatter.format(number.doubleValue());