From cf9130e06ca7f8a432b2fb0079acada605f3bbb7 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 30 Nov 2022 01:34:01 -0500 Subject: [PATCH 1/2] Fixed edge case where ecid may start with 0x java.lang.NumberFormatException: For input string: "0x162431234501E" under radix 16 at java.base/java.lang.NumberFormatException.forInputString(Unknown Source) at java.base/java.lang.Long.parseLong(Unknown Source) at airsquared.blobsaver@3.3.0/airsquared.blobsaver.app.TSS.saveBlobsTSSSaver(Unknown Source) at airsquared.blobsaver@3.3.0/airsquared.blobsaver.app.TSS.call(Unknown Source) at airsquared.blobsaver@3.3.0/airsquared.blobsaver.app.TSS.call(Unknown Source) at javafx.graphics@19/javafx.concurrent.Task$TaskCallable.call(Unknown Source) at java.base/java.util.concurrent.FutureTask.run(Unknown Source) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) at java.base/java.lang.Thread.run(Unknown Source) --- src/main/java/airsquared/blobsaver/app/TSS.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/airsquared/blobsaver/app/TSS.java b/src/main/java/airsquared/blobsaver/app/TSS.java index 772089d4..d326b3b8 100644 --- a/src/main/java/airsquared/blobsaver/app/TSS.java +++ b/src/main/java/airsquared/blobsaver/app/TSS.java @@ -387,11 +387,11 @@ public void showErrorAlert() { } } } - + private void saveBlobsTSSSaver(StringBuilder responseBuilder) { Map deviceParameters = new HashMap<>(); - deviceParameters.put("ecid", String.valueOf(Long.parseLong(ecid, 16))); + deviceParameters.put("ecid", String.valueOf(Long.parseLong(ecid.startsWith("0x") ? ecid.substring(2) : ecid, 16))); deviceParameters.put("deviceIdentifier", deviceIdentifier); deviceParameters.put("boardConfig", getBoardConfig()); From b018207a4070688a2aa640579e0125ad92d4c24e Mon Sep 17 00:00:00 2001 From: airsquared <36649395+airsquared@users.noreply.github.com> Date: Mon, 12 Dec 2022 12:12:48 -0800 Subject: [PATCH 2/2] Update TSS.java --- src/main/java/airsquared/blobsaver/app/TSS.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/airsquared/blobsaver/app/TSS.java b/src/main/java/airsquared/blobsaver/app/TSS.java index d326b3b8..4e350a71 100644 --- a/src/main/java/airsquared/blobsaver/app/TSS.java +++ b/src/main/java/airsquared/blobsaver/app/TSS.java @@ -387,7 +387,7 @@ public void showErrorAlert() { } } } - + private void saveBlobsTSSSaver(StringBuilder responseBuilder) { Map deviceParameters = new HashMap<>();