Merge 9eb5089eae into fb54d8b549

move function

ann/src/main/java/com/twitter/ann/faiss/NativeUtils.java

@@ -45,6 +45,9 @@ public final class NativeUtils {
     } catch (NullPointerException e) {
       temp.delete();
       throw new FileNotFoundException("File " + path + " was not found inside JAR.");
+    } catch (Exception e) {
+      file.delete();
+      throw e;
     }
 
     return temp;
@@ -91,22 +94,24 @@ public final class NativeUtils {
    *                                  JAR.
    */
       public static void loadLibraryFromJar(String path) throws IOException {
-    File temp = unpackLibraryFromJarInternal(path);
+        File tempFile = unpackLibraryFromJarInternal(path);
-
+        copyResourceToFile(path, tempFile);
-    try (InputStream is = NativeUtils.class.getResourceAsStream(path)) {
+        try {
-      Files.copy(is, temp.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            System.load(tempFile.getAbsolutePath());
-    } catch (IOException e) {
+        } finally {
-      temp.delete();
+            tempFile.deleteOnExit();
-      throw e;
+        }
-    } catch (NullPointerException e) {
-      temp.delete();
-      throw new FileNotFoundException("File " + path + " was not found inside JAR.");
     }
 
-    try {
+  private static void copyResourceToFile(String resourcePath, File file) throws IOException {
-      System.load(temp.getAbsolutePath());
+      try ( InputStream inputStream = NativeUtils.class.getResourceAsStream(resourcePath)) {
-    } finally {
+          Files.copy(inputStream, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
-      temp.deleteOnExit();
+      } catch (IOException e) {
+          file.delete();
+          throw e;
+      } catch (NullPointerException e) {
+          file.delete();
+          throw new FileNotFoundException("File " + resourcePath + " was not found inside JAR.");
       }
   }