Attempt to close file

jpype-project · Dec 21, 2024 · e80100b · e80100b
1 parent f1a7117
commit e80100b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/native/common/jp_context.cpp b/native/common/jp_context.cpp
@@ -184,8 +184,9 @@ std::string getShared()
 	{
 		// This is needed when there is no-ascii characters in path
 		char shortPathBuffer[MAX_PATH];
-		GetShortPathName(path, shortPathBuffer, MAX_PATH);
-		return shortPathBuffer;
+		long len = GetShortPathName(path, shortPathBuffer, MAX_PATH);
+		if (len != 0)
+			return std::string(shortPathBuffer);
 	}
 #else
 	// Linux specific

diff --git a/native/java/org/jpype/JPypeContext.java b/native/java/org/jpype/JPypeContext.java
@@ -16,6 +16,7 @@
 package org.jpype;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -282,6 +283,14 @@ private void shutdown()
     {
       run.run();
     }
+    try
+    {
+      classLoader.close();
+    } catch (IOException ex)
+    {
+      // ignored
+    }
+
 
   }