Merge pull request #13 from mabruce/tempfile-deleter

* Clean up Windows `java.io.tmpdir` even when program messes with `java.class.path` (issue #12)
bytedeco · Feb 24, 2015 · e2af6ce · e2af6ce
2 parents ab7237e + 146674f
commit e2af6ce
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/org/bytedeco/javacpp/Loader.java b/src/main/java/org/bytedeco/javacpp/Loader.java
@@ -26,6 +26,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
+import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -569,12 +570,14 @@ public static String loadLibrary(URL[] urls, String libnameversion) {
                         LinkedList<String> command = new LinkedList<String>();
                         command.add(System.getProperty("java.home") + "/bin/java");
                         command.add("-classpath");
-                        command.add(System.getProperty("java.class.path"));
+                        command.add((new File(Loader.class.getProtectionDomain().getCodeSource().getLocation().toURI())).toString());
                         command.add(Loader.class.getName());
                         command.add(tempDir.getAbsolutePath());
                         new ProcessBuilder(command).start();
                     } catch (IOException e) {
                         throw new RuntimeException(e);
+                    } catch (URISyntaxException e) {
+                        throw new RuntimeException(e);
                     }
                 }
             });