Java - Fixed a reference counting bug in the OrtEnvironment close method. Added a unit test for the bug.

Craigacp · Changming Sun · commit 4cc0031177c2 · 2020-01-29T23:39:37.000-08:00
diff --git a/java/src/main/java/ai/onnxruntime/OrtEnvironment.java b/java/src/main/java/ai/onnxruntime/OrtEnvironment.java
@@ -248,14 +248,14 @@ public String toString() {
      */
     @Override
     public synchronized void close() throws OrtException {
-        closed = true;
         synchronized (refCount) {
             int curCount = refCount.get();
             if (curCount != 0) {
                 refCount.decrementAndGet();
             }
             if (curCount == 1) {
                 close(OnnxRuntime.ortApiHandle, nativeHandle);
+                closed = true;
                 INSTANCE = null;
             }
         }
diff --git a/java/src/test/java/ai/onnxruntime/InferenceTest.java b/java/src/test/java/ai/onnxruntime/InferenceTest.java
@@ -17,6 +17,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -70,6 +71,17 @@ public class InferenceTest {
         }
     }
 
+    @Test
+    public void repeatedCloseTest() throws OrtException {
+        OrtEnvironment env = OrtEnvironment.getEnvironment("repeatedCloseTest");
+        try (OrtEnvironment otherEnv = OrtEnvironment.getEnvironment()) {
+            assertFalse(otherEnv.isClosed());
+        }
+        assertFalse(env.isClosed());
+        env.close();
+        assertTrue(env.isClosed());
+    }
+
     @Test
     public void createSessionFromPath() throws OrtException {
         String modelPath = resourcePath.resolve("squeezenet.onnx").toString();

Original file line number	Diff line number	Diff line change
`@@ -248,14 +248,14 @@ public String toString() {`
`248`	`248`	`*/`
`249`	`249`	`@Override`
`250`	`250`	`public synchronized void close() throws OrtException {`
`251`		`- closed = true;`
`252`	`251`	`synchronized (refCount) {`
`253`	`252`	`int curCount = refCount.get();`
`254`	`253`	`if (curCount != 0) {`
`255`	`254`	`refCount.decrementAndGet();`
`256`	`255`	`}`
`257`	`256`	`if (curCount == 1) {`
`258`	`257`	`close(OnnxRuntime.ortApiHandle, nativeHandle);`
	`258`	`+ closed = true;`
`259`	`259`	`INSTANCE = null;`
`260`	`260`	`}`
`261`	`261`	`}`