From 79bff7d1bbd86acfda536f99d3add312e05f2e72 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 22 Apr 2022 16:36:16 +1000 Subject: [PATCH] fix bugs in temp rework --- .../src/main/java/org/hl7/fhir/utilities/Utilities.java | 2 +- .../src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java index ccc7b48ac..fdd688232 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java @@ -595,7 +595,7 @@ public class Utilities { if (s.length() == 0) { if ("[tmp]".equals(a)) { if (hasCTempDir()) { - a = Utilities.path("[tmp]"); + a = C_TEMP_DIR; } else if (ToolGlobalSettings.hasTempPath()) { a = ToolGlobalSettings.getTempPath(); } else { diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java index 588c3ddee..8c4382b29 100644 --- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java +++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java @@ -92,7 +92,7 @@ class UtilitiesTest { } else if (os.toUpperCase().contains(WINDOWS)) { File tmp = new File(Utilities.C_TEMP_DIR); if(tmp.exists()) { - return Utilities.C_TEMP_DIR; + return Utilities.C_TEMP_DIR + '\\'; } else { return System.getProperty("java.io.tmpdir"); }