merge fixes for #1400 with updates to #3088

benfry · benfry · commit 12d825135e64 · 2015-04-01T11:38:52.000-04:00
diff --git a/java/libraries/net/src/processing/net/Client.java b/java/libraries/net/src/processing/net/Client.java
@@ -61,7 +61,8 @@ public class Client implements Runnable {
   int bufferIndex;
   int bufferLast;
 
-  boolean isDisposeRegistered = false;
+  boolean disposeRegistered = false;
+  
   
   /**
    * @param parent typically use "this"
@@ -82,7 +83,7 @@ public Client(PApplet parent, String host, int port) {
       thread.start();
 
       parent.registerMethod("dispose", this);
-      isDisposeRegistered = true;
+      disposeRegistered = true;
 
       // reflection to check whether host sketch has a call for
       // public void clientEvent(processing.net.Client)
@@ -160,9 +161,9 @@ public void stop() {
         disconnectEventMethod = null;
       }
     }
-    if(isDisposeRegistered){
+    if (disposeRegistered) {
       parent.unregisterMethod("dispose", this);
-      isDisposeRegistered = false;
+      disposeRegistered = false;
     }
     dispose();
   }
diff --git a/todo.txt b/todo.txt
@@ -75,6 +75,9 @@ X   https://github.com/processing/processing/pull/3132
 X offer to install libraries imported libraries that are not available
 X   https://github.com/processing/processing/pull/3155
 X   https://github.com/processing/processing/issues/2566
+X make fatal errors terminate the pde
+X   https://github.com/processing/processing/issues/3068
+X   https://github.com/processing/processing/pull/3069
 
 manindra
 X Fix for "Probably a ++ should go here" messages
@@ -139,6 +142,9 @@ X   https://github.com/processing/processing/pull/3138
 X   https://github.com/processing/processing/issues/3136
 X Display download percentage when fetching contrib info
 X   https://github.com/processing/processing/pull/3161
+X Recreating Client instance will cause an out-of-memory error
+X   https://github.com/processing/processing/issues/1400
+X   https://github.com/processing/processing/pull/3088
 
 integration of pdex
 X changed JLS4 to JLS8 (but make sure it doesn't introduce anything too weird)
