Implements disconnectEvent for the Server code as requested in Issue processing#2133

kfeuz · kfeuz · commit 252a68e2256b · 2014-04-18T01:42:54.000-07:00
diff --git a/java/libraries/net/src/processing/net/Client.java b/java/libraries/net/src/processing/net/Client.java
@@ -118,13 +118,24 @@ public Client(PApplet parent, String host, int port) {
    * @throws IOException
    */
   public Client(PApplet parent, Socket socket) throws IOException {
+    this.parent = parent;
     this.socket = socket;
 
     input = socket.getInputStream();
     output = socket.getOutputStream();
 
     thread = new Thread(this);
     thread.start();
+
+    // reflection to check whether host sketch has a call for
+    // public void disconnectEvent(processing.net.Client)
+    try {
+      disconnectEventMethod =
+        parent.getClass().getMethod("disconnectEvent",
+                                    new Class[] { Client.class });
+    } catch (Exception e) {
+      // no such method, or an error.. which is fine, just ignore
+    }
   }
 
 
diff --git a/java/libraries/net/src/processing/net/Server.java b/java/libraries/net/src/processing/net/Server.java
@@ -109,7 +109,11 @@ public Server(PApplet parent, int port) {
    * @param client the client to disconnect
    */
   public void disconnect(Client client) {
-    //client.stop();
+    //Calling client.stop() here would cause duplicate
+    //calls to disconnectEvent in the containing sketch,
+    //once for the stop() and once for the terminated connection.
+    //Instead just dispose of the client and let the terminated
+    //connection generate the disconnectEvent message;
     client.dispose();
     int index = clientIndex(client);
     if (index != -1) {
