From 4637f45c4cd0c421d96a5e726f8820aa42d30767 Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Mon, 16 Mar 2026 15:25:19 -0600 Subject: [PATCH 1/2] Use disk cache directory for decompression --- cdm/core/src/main/java/ucar/nc2/NetcdfFiles.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdm/core/src/main/java/ucar/nc2/NetcdfFiles.java b/cdm/core/src/main/java/ucar/nc2/NetcdfFiles.java index e1cf0531ba..74f17f028f 100644 --- a/cdm/core/src/main/java/ucar/nc2/NetcdfFiles.java +++ b/cdm/core/src/main/java/ucar/nc2/NetcdfFiles.java @@ -379,7 +379,7 @@ private static ucar.unidata.io.RandomAccessFile downloadAndDecompress(ucar.unida if (pos < 0) pos = uriString.lastIndexOf(':'); - String tmp = System.getProperty("java.io.tmpdir"); + String tmp = DiskCache.getRootDirectory(); String filename = uriString.substring(pos + 1); String sep = File.separator; From 295d7141af4a9b718b3a7c8bd0ce683bf16a19de Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Mon, 16 Mar 2026 15:26:01 -0600 Subject: [PATCH 2/2] Minor log message fixes --- cdm/core/src/main/java/ucar/nc2/util/DiskCache.java | 2 +- cdm/core/src/main/java/ucar/nc2/util/DiskCache2.java | 2 +- cdm/core/src/main/java/ucar/nc2/util/cache/FileCache.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cdm/core/src/main/java/ucar/nc2/util/DiskCache.java b/cdm/core/src/main/java/ucar/nc2/util/DiskCache.java index 1fdba385ad..7947d30255 100644 --- a/cdm/core/src/main/java/ucar/nc2/util/DiskCache.java +++ b/cdm/core/src/main/java/ucar/nc2/util/DiskCache.java @@ -311,7 +311,7 @@ public static void cleanCache(long maxBytes, StringBuilder sbuff) { */ public static void cleanCache(long maxBytes, Comparator fileComparator, StringBuilder sbuff) { if (sbuff != null) - sbuff.append("DiskCache clean maxBytes= ").append(maxBytes).append("on dir ").append(root).append("\n"); + sbuff.append("DiskCache clean maxBytes= ").append(maxBytes).append(" on dir ").append(root).append("\n"); File dir = new File(root); long total = 0, total_delete = 0; diff --git a/cdm/core/src/main/java/ucar/nc2/util/DiskCache2.java b/cdm/core/src/main/java/ucar/nc2/util/DiskCache2.java index 1bf0c21d24..334f4f0df0 100644 --- a/cdm/core/src/main/java/ucar/nc2/util/DiskCache2.java +++ b/cdm/core/src/main/java/ucar/nc2/util/DiskCache2.java @@ -39,7 +39,7 @@ public class DiskCache2 { public static void exit() { if (timer != null) { timer.cancel(); - cacheLog.info("DiskCache2.exit()%n"); + cacheLog.info("DiskCache2.exit()"); } timer = null; } diff --git a/cdm/core/src/main/java/ucar/nc2/util/cache/FileCache.java b/cdm/core/src/main/java/ucar/nc2/util/cache/FileCache.java index 8eba060ce7..a5246c8797 100755 --- a/cdm/core/src/main/java/ucar/nc2/util/cache/FileCache.java +++ b/cdm/core/src/main/java/ucar/nc2/util/cache/FileCache.java @@ -80,7 +80,7 @@ public static void shutdown() { synchronized (lock) { if (timer != null) { timer.cancel(); - cacheLog.info("FileCache.shutdown called%n"); + cacheLog.info("FileCache.shutdown called"); } timer = null; }