From 516e9ae6df96a23ff788b0fe6d8f6ebde6ce8ecf Mon Sep 17 00:00:00 2001
From: Sean Arms <67096+lesserwhirls@users.noreply.github.com>
Date: Mon, 2 Feb 2026 18:18:57 -0700
Subject: [PATCH 1/2] Add method to close netCDF-C native library

Provide a method to close the netCDF-C native library, otherwise the JNA
cleaner thread may get blocked.
---
 .../ucar/nc2/ffi/netcdf/NetcdfClibrary.java     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/netcdf4/src/main/java/ucar/nc2/ffi/netcdf/NetcdfClibrary.java b/netcdf4/src/main/java/ucar/nc2/ffi/netcdf/NetcdfClibrary.java
index 5f76264537..d721c046d3 100644
--- a/netcdf4/src/main/java/ucar/nc2/ffi/netcdf/NetcdfClibrary.java
+++ b/netcdf4/src/main/java/ucar/nc2/ffi/netcdf/NetcdfClibrary.java
@@ -6,7 +6,9 @@
 package ucar.nc2.ffi.netcdf;
 
 import com.google.common.base.Strings;
+import com.sun.jna.Library;
 import com.sun.jna.Native;
+import java.lang.reflect.Proxy;
 import javax.annotation.Nullable;
 import ucar.nc2.jni.netcdf.Nc4prototypes;
 import ucar.nc2.jni.netcdf.Nc4wrapper;
@@ -128,6 +130,21 @@ public static synchronized int setLogLevel(int level) {
     return oldlevel;
   }
 
+  /**
+   * Closes the netCDF-C native library.
+   *
+   * <p>
+   * Call this method to ensure JNA can shut down its cleaner thread; otherwise JVM shutdown may be blocked.
+   * </p>
+   */
+  public static synchronized void shutdown() {
+    if (nc4 != null) {
+      Library.Handler lh = (Library.Handler) Proxy.getInvocationHandler(nc4);
+      lh.getNativeLibrary().close();
+      nc4 = null;
+    }
+  }
+
   private static Nc4prototypes load() {
     if (nc4 == null) {
       if (jnaPath == null) {

From 6211f3635f2f985cb48be979917d60cc265f0fbd Mon Sep 17 00:00:00 2001
From: Sean Arms <67096+lesserwhirls@users.noreply.github.com>
Date: Mon, 2 Feb 2026 18:26:57 -0700
Subject: [PATCH 2/2] Shutdown NetcdfClibrary when exiting toolsUI

---
 uicdm/src/main/java/ucar/nc2/ui/ToolsUI.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/uicdm/src/main/java/ucar/nc2/ui/ToolsUI.java b/uicdm/src/main/java/ucar/nc2/ui/ToolsUI.java
index 6a02447f19..28f764de5c 100644
--- a/uicdm/src/main/java/ucar/nc2/ui/ToolsUI.java
+++ b/uicdm/src/main/java/ucar/nc2/ui/ToolsUI.java
@@ -16,6 +16,7 @@
 import ucar.nc2.dods.DODSNetcdfFile;
 import ucar.nc2.dt.GridDataset;
 import ucar.nc2.dt.RadialDatasetSweep;
+import ucar.nc2.ffi.netcdf.NetcdfClibrary;
 import ucar.nc2.ft.point.PointDatasetImpl;
 import ucar.nc2.ft2.coverage.*;
 import ucar.nc2.grib.GribIndexCache;
@@ -1312,6 +1313,10 @@ public void run(Object o) {
 
   public static void exit() {
     doSavePrefsAndUI();
+    // close netCDF-C library, if loaded
+    if (NetcdfClibrary.isLibraryPresent()) {
+      NetcdfClibrary.shutdown();
+    }
     System.exit(0);
   }