You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2026/10/08 21:04:12 UTC
(sis) branch geoapi-4.0 updated: NetCDF reader using UCAR library was disabled by accident.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 1f1f565ec6 NetCDF reader using UCAR library was disabled by accident.
1f1f565ec6 is described below
commit 1f1f565ec64ef0e7e1aca9691de3505ef2a71821
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Thu Oct 8 23:03:44 2026 +0200
NetCDF reader using UCAR library was disabled by accident.
---
.../main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java | 8 +++++---
.../main/org/apache/sis/storage/DataStoreRegistry.java | 1 -
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
index 32cdbce872..4cf5ecac32 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
@@ -302,8 +302,8 @@ public class NetcdfStoreProvider extends DataStoreProvider {
throws IOException, DataStoreException
{
final GeometryLibrary geomlib = connector.getOption(OptionKey.GEOMETRY_LIBRARY);
- Decoder decoder;
- Object keepOpen;
+ Decoder decoder = null;
+ Object keepOpen = null;
final ChannelDataInput input = connector.getStorageAs(ChannelDataInput.class);
if (input != null) try {
decoder = new ChannelDecoder(input, connector.getOption(OptionKey.ENCODING), geomlib, listeners);
@@ -316,7 +316,9 @@ public class NetcdfStoreProvider extends DataStoreProvider {
} catch (IOException | DataStoreException s) {
e.addSuppressed(s);
}
- throw e;
+ if (decoder == null) {
+ throw e;
+ }
} else {
keepOpen = connector.getStorage();
decoder = createByReflection(keepOpen, true, geomlib, listeners);
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreRegistry.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreRegistry.java
index 358f189bcb..2e4e3d465b 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreRegistry.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreRegistry.java
@@ -26,7 +26,6 @@ import org.apache.sis.io.stream.InternalOptionKey;
import org.apache.sis.system.Reflect;
import org.apache.sis.system.Modules;
import org.apache.sis.system.SystemListener;
-import org.apache.sis.storage.OptionKey;
import org.apache.sis.storage.internal.Resources;
import org.apache.sis.storage.base.Capability;
import org.apache.sis.storage.base.StoreMetadata;