Merge branch 'v33.2-optimize-20241104' into master_jdk17

clx-performance-web/src/main/java/com/nbopen/api/NBOpenSDK.java

@@ -208,8 +208,9 @@ public final class NBOpenSDK {
     }
 
     private static void unzipJarJar(String jarPath, String srcPath, String dstPath) {
+        JarFile jarFile = null;
         try {
-            JarFile jarFile = new JarFile(jarPath);
+            jarFile = new JarFile(jarPath);
             Enumeration<JarEntry> entries = jarFile.entries();
 
             while(entries.hasMoreElements()) {
@@ -233,11 +234,20 @@ public final class NBOpenSDK {
             }
         } catch (Exception var10) {
             var10.printStackTrace();
+        } finally {
+            if (jarFile != null) {
+                try {
+                    jarFile.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
         }
 
     }
 
     private static File unpackToFolder(File jarPath, NBClassLoader classLoader) {
+        JarFile jarFile = null;
         try {
             String userDir = System.getProperty("user.dir");
             System.out.println("nbsdk-userDir: " + userDir);
@@ -251,7 +261,7 @@ public final class NBOpenSDK {
             }
 
             folder.deleteOnExit();
-            JarFile jarFile = new JarFile(jarPath);
+            jarFile = new JarFile(jarPath);
             Enumeration<JarEntry> entries = jarFile.entries();
 
             while(entries.hasMoreElements()) {
@@ -272,6 +282,14 @@ public final class NBOpenSDK {
         } catch (Exception var12) {
             System.out.println("nbsdk- unpack to folder error" + var12);
             throw new RuntimeException(var12);
+        } finally {
+            if (jarFile != null) {
+                try {
+                    jarFile.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
         }
     }
 
@@ -329,26 +347,6 @@ public final class NBOpenSDK {
         }
     }
 
-    private static void deleteFile(File file) {
-        if (file.exists()) {
-            if (file.isFile()) {
-                file.delete();
-            } else {
-                File[] listFiles = file.listFiles();
-                File[] var2 = listFiles;
-                int var3 = listFiles.length;
-
-                for(int var4 = 0; var4 < var3; ++var4) {
-                    File f = var2[var4];
-                    deleteFile(f);
-                }
-            }
-
-            file.delete();
-        }
-
-    }
-
     private static void printMsg(String data) {
         String debuged = System.getProperty("nbsdk.sys.debug", "false");
         if (Boolean.parseBoolean(debuged)) {