Merge pull request #3051 from AmilaSamith/issue-fix-299

[MI-4.2.0] Fix to close input streams explicitly
wso2 · Feb 8, 2024 · d7ba885 · d7ba885
2 parents c1edc8b + 61a97fc
commit d7ba885
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/...or.registry/src/main/java/org/wso2/micro/integrator/registry/MicroIntegratorRegistry.java b/...or.registry/src/main/java/org/wso2/micro/integrator/registry/MicroIntegratorRegistry.java
@@ -299,8 +299,8 @@ private boolean lookupUtil(String key, URL url) {
         if ("file".equals(url.getProtocol())) {
             try {
                 if (new File(url.toURI()).exists()) {
-                    try {
-                        url.openStream();
+                    try (InputStream inputStream = url.openStream()) {
+                        // This try-with-resources block is used to check whether the resource is accessible
                     } catch (IOException e) {
                         log.error("Error occurred while accessing registry resource: " + key, e);
                         return true;
@@ -415,8 +415,8 @@ public RegistryEntry getRegistryEntry(String key) {
         try {
             URL url = new URL(resolveRegistryURI(key));
             if ("file".equals(url.getProtocol())) {
-                try {
-                    url.openStream();
+                try (InputStream inputStream = url.openStream()) {
+                    // This try-with-resources block is used to check whether the resource is accessible
                 } catch (IOException e) {
                     log.error("Error occurred while accessing registry resource: " + key, e);
                     return null;
@@ -1133,8 +1133,8 @@ private void addConfigProperty(String name, String value) {
                         registryType = MicroIntegratorRegistryConstants.LOCAL_HOST_REGISTRY;
 
                         //Check existence of the target location
-                        try {
-                            rootPathUrl.openStream();
+                        try (InputStream inputStream = rootPathUrl.openStream()) {
+                            // This try-with-resources block is used to check whether the resource is accessible
                         } catch (IOException e) {
                             // If the registry is filesystem based, user may have provided the URI relative to the CARBON_HOME
                             if (log.isDebugEnabled()) {
@@ -1147,8 +1147,7 @@ private void addConfigProperty(String name, String value) {
                             }
                             pathFromCarbonHome = rootPathUrl.getProtocol() + ":" + pathFromCarbonHome + value;
                             rootPathUrl = new URL(pathFromCarbonHome);
-                            try {
-                                rootPathUrl.openStream();
+                            try (InputStream inputStream = rootPathUrl.openStream()) {
                                 value = pathFromCarbonHome;
                             } catch (IOException e1) {
                                 //Unable to open input stream to target location