From 9d26990313086f17a95c19c89f3f908e863d0e1b Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Mon, 17 Sep 2018 17:14:57 +0200 Subject: [PATCH] - Java tools: fixed bug in SCL parser (wrong interpretation of numbers with leading "0" --- tools/model_generator/genmodel.jar | Bin 89203 -> 89228 bytes .../libiec61850/scl/model/DataModelValue.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/model_generator/genmodel.jar b/tools/model_generator/genmodel.jar index 5554c798f0e95d77f0815a6d86c4914bafd796e2..a00927c6e3e7b772b712f97a4493b7a994e4d130 100644 GIT binary patch delta 5115 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 J1JFi8{13?}rON;S delta 5014 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 MWtj#Ik;pLr1JcmvI{*Lx diff --git a/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java b/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java index 4efc1e38..1d4fb21a 100644 --- a/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java +++ b/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java @@ -86,7 +86,7 @@ public class DataModelValue { if (trimmedValue.isEmpty()) this.value = new Long(0); else - this.value = Long.decode(trimmedValue); + this.value = Long.parseLong(trimmedValue); break; case BOOLEAN: