Prevent memory leak by unregistering parent dispose method

kfeuz · kfeuz · commit 47163194716b · 2015-02-05T00:24:08.000-07:00
diff --git a/java/libraries/net/src/processing/net/Client.java b/java/libraries/net/src/processing/net/Client.java
@@ -61,6 +61,7 @@ public class Client implements Runnable {
   int bufferIndex;
   int bufferLast;
 
+  boolean isDisposeRegistered = false;
   
   /**
    * @param parent typically use "this"
@@ -81,6 +82,7 @@ public Client(PApplet parent, String host, int port) {
       thread.start();
 
       parent.registerMethod("dispose", this);
+      isDisposeRegistered = true;
 
       // reflection to check whether host sketch has a call for
       // public void clientEvent(processing.net.Client)
@@ -158,6 +160,9 @@ public void stop() {
         disconnectEventMethod = null;
       }
     }
+    if(isDisposeRegistered){
+      parent.unregisterMethod("dispose", this);
+    }
     dispose();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ public class Client implements Runnable {`
`61`	`61`	`int bufferIndex;`
`62`	`62`	`int bufferLast;`
`63`	`63`
	`64`	`+ boolean isDisposeRegistered = false;`
`64`	`65`
`65`	`66`	`/**`
`66`	`67`	`* @param parent typically use "this"`
`@@ -81,6 +82,7 @@ public Client(PApplet parent, String host, int port) {`
`81`	`82`	`thread.start();`
`82`	`83`
`83`	`84`	`parent.registerMethod("dispose", this);`
	`85`	`+ isDisposeRegistered = true;`
`84`	`86`
`85`	`87`	`// reflection to check whether host sketch has a call for`
`86`	`88`	`// public void clientEvent(processing.net.Client)`
`@@ -158,6 +160,9 @@ public void stop() {`
`158`	`160`	`disconnectEventMethod = null;`
`159`	`161`	`}`
`160`	`162`	`}`
	`163`	`+ if(isDisposeRegistered){`
	`164`	`+ parent.unregisterMethod("dispose", this);`
	`165`	`+ }`
`161`	`166`	`dispose();`
`162`	`167`	`}`
`163`	`168`