From 2d2d9138fbe5c9c43f070be59a2d10f18fbf4c3b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 十一月 2022 09:05:06 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/helper/MdbHelper.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/MdbHelper.java b/src/main/java/com/lf/server/helper/MdbHelper.java
index 3fb1942..71bb0fe 100644
--- a/src/main/java/com/lf/server/helper/MdbHelper.java
+++ b/src/main/java/com/lf/server/helper/MdbHelper.java
@@ -23,11 +23,15 @@
         List<String> list = new ArrayList<>();
         try {
             org.gdal.ogr.Driver driver = ogr.GetDriverByName("PGeo");
-            if (driver == null) {
+            if (null == driver) {
                 return list;
             }
 
             DataSource dataSource = driver.Open(filePath, 0);
+            if (null == dataSource) {
+                return list;
+            }
+
             for (int i = 0, count = dataSource.GetLayerCount(); i < count; i++) {
                 Layer layer = dataSource.GetLayer(i);
                 list.add(layer.GetName());
@@ -51,15 +55,19 @@
         List<T> list = new ArrayList<>();
         try {
             org.gdal.ogr.Driver driver = ogr.GetDriverByName("PGeo");
-            if (driver == null) {
+            if (null == driver) {
                 return list;
             }
 
             DataSource dataSource = driver.Open(filePath, 0);
+            if (null == dataSource) {
+                return list;
+            }
+
             for (int i = 0, count = dataSource.GetLayerCount(); i < count; i++) {
                 Layer layer = dataSource.GetLayer(i);
 
-                if (layer.GetName().equals(layerName)){
+                if (layer.GetName().equals(layerName)) {
                     GdbHelper.readLayer(clazz, layer, list);
                     break;
                 }

--
Gitblit v1.9.3