Fix segfault when JackClient garbage collected.

jaudiolibs · Nov 18, 2014 · 2e20036 · 2e20036
1 parent 1d7861a
commit 2e20036
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.jaudiolibs</groupId>
   <artifactId>jnajack</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <packaging>jar</packaging>
 
   <name>jnajack</name>

diff --git a/src/main/java/org/jaudiolibs/jnajack/JackClient.java b/src/main/java/org/jaudiolibs/jnajack/JackClient.java
@@ -55,7 +55,8 @@ public class JackClient {
     final Jack jack;
     final JackLibrary jackLib;
     final String name;
-    final JackLibrary._jack_client clientPtr; // package private
+
+    JackLibrary._jack_client clientPtr; // package private
 
     private ProcessCallbackWrapper processCallback; // reference kept - is in use!
     private BufferSizeCallbackWrapper buffersizeCallback;
@@ -395,7 +396,7 @@ public void deactivate() {
     /**
      * Disconnects this client from the JACK server.
      */
-    public void close() {
+    public synchronized void close() {
         try {
             if (clientPtr != null) {
                 jackLib.jack_client_close(clientPtr);
@@ -404,7 +405,7 @@ public void close() {
         } catch (Throwable e) {
             LOG.log(Level.SEVERE, CALL_ERROR_MSG, e);
         } finally {
-//            clientPtr = null;
+            clientPtr = null;
         }
     }
 
@@ -453,11 +454,6 @@ private void processShutdown() {
         }
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        super.finalize();
-        close();
-    }
 
     private class ProcessCallbackWrapper implements JackLibrary.JackProcessCallback {