[GEOS-7882] Fix status NPE when using custom GDAL

geoserver · Dec 8, 2016 · 82605dc · 82605dc
1 parent 84187a7
commit 82605dc
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/extension/gdal/src/main/java/org/geoserver/gdal/GDALStatus.java b/src/extension/gdal/src/main/java/org/geoserver/gdal/GDALStatus.java
@@ -54,7 +54,7 @@ public boolean isEnabled() {
 
     @Override
     public Optional<String> getMessage() {
-        String message = "JNI GDAL Wrapper Version: " + getGDALWrapperJarVersion();
+        String message = "JNI GDAL Wrapper Version: " + getGDALWrapperJarVersion().orElse("null");
         if (!isAvailable()) {
             message += "\njava.library.path: " + System.getProperty("java.library.path", "");
         } else {
@@ -68,11 +68,15 @@ public Optional<String> getDocumentation() {
         return Optional.ofNullable("");
     }
 
-    public String getGDALWrapperJarVersion() {
+    public Optional<String> getGDALWrapperJarVersion() {
         if (isAvailable()) {
-            return GeoTools.getVersion(gdal.class).toString();
+            Version v = GeoTools.getVersion(gdal.class);
+            if (v == null) {
+                return Optional.empty();
+            }
+            return Optional.ofNullable(v.toString());
         } else {
-            return "unavailable";
+            return Optional.ofNullable("unavailable");
         }
     }