Merge pull request #223 from Bhashinee/release-4.0.31

Fix the null pointer when closing the file system if the connection fails to establish
wso2-extensions · Sep 3, 2024 · cfef1de · cfef1de
2 parents e5b2d2d + 9955e91
commit cfef1de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.connector-store/meta.json b/.connector-store/meta.json
@@ -10,7 +10,7 @@
     ],
     "releases": [
         {
-            "tagName": "v4.0.29",
+            "tagName": "v4.0.31",
             "products": [
                 "EI 7.1.0",
                 "EI 6.6.0",

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.esb.connector</groupId>
     <artifactId>org.wso2.carbon.esb.connector.file</artifactId>
-    <version>4.0.30</version>
+    <version>4.0.31</version>
     <packaging>jar</packaging>
     <name>WSO2 Carbon - Connector For esb-connector-file</name>
     <url>http://wso2.org</url>

diff --git a/src/main/java/org/wso2/carbon/connector/utils/Utils.java b/src/main/java/org/wso2/carbon/connector/utils/Utils.java
@@ -311,10 +311,13 @@ public static String maskURLPassword(String url) {
     public static void closeFileSystem(FileObject fileObject) {
         try {
             //Close the File system if it is not already closed
-            if (fileObject != null && fileObject.getParent() != null && fileObject.getParent().getFileSystem() != null) {
-                fileObject.getParent().getFileSystem().getFileSystemManager().closeFileSystem(fileObject.getFileSystem());
+            if (fileObject != null) {
+                if (fileObject.getParent() != null && fileObject.getParent().getFileSystem() != null) {
+                    fileObject.getParent().getFileSystem().getFileSystemManager()
+                            .closeFileSystem(fileObject.getFileSystem());
+                }
+                fileObject.close();
             }
-            fileObject.close();
         } catch (FileSystemException warn) {
             String message = "Error on closing the file: " + fileObject.getName().getPath();
             log.warn(message, warn);