demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 19:55:48 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

the format pattern must not be null (#874)

Browse Source 
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
This commit is contained in:
Markus Rathgeb 2019-06-20 21:19:46 +02:00 committed by Kai Kreuzer
parent 024cc5d40e
commit 0fc38a910b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/library/types/QuantityType.java
View File

@ -229,12 +229,14 @@ public class QuantityType<T extends Quantity<T>> extends Number
}
@Override
public String format(@Nullable String pattern) {
String formatPattern = pattern;
public String format(String pattern) {
final String formatPattern;
if (formatPattern != null && formatPattern.contains(UnitUtils.UNIT_PLACEHOLDER)) {
if (pattern.contains(UnitUtils.UNIT_PLACEHOLDER)) {
String unitSymbol = getUnit().equals(SmartHomeUnits.PERCENT) ? "%%" : getUnit().toString();
formatPattern = formatPattern.replace(UnitUtils.UNIT_PLACEHOLDER, unitSymbol);
formatPattern = pattern.replace(UnitUtils.UNIT_PLACEHOLDER, unitSymbol);
} else {
formatPattern = pattern;
}
// The value could be an integer value. Try to convert to BigInteger in