Merge pull request processing#2578 from kfeuz/Issue2577

benfry · benfry · commit fe86353a8c4c · 2014-11-14T14:31:14.000-07:00
Fixes NPE when writing to disconnected client, Issue processing#2577
diff --git a/java/libraries/net/src/processing/net/Server.java b/java/libraries/net/src/processing/net/Server.java
@@ -310,8 +310,8 @@ public void run() {
   public void write(int data) {  // will also cover char
     int index = 0;
     while (index < clientCount) {
-      clients[index].write(data);
       if (clients[index].active()) {
+        clients[index].write(data);
         index++;
       } else {
         removeIndex(index);
@@ -323,8 +323,8 @@ public void write(int data) {  // will also cover char
   public void write(byte data[]) {
     int index = 0;
     while (index < clientCount) {
-      clients[index].write(data);
       if (clients[index].active()) {
+        clients[index].write(data);
         index++;
       } else {
         removeIndex(index);
@@ -336,8 +336,8 @@ public void write(byte data[]) {
   public void write(String data) {
     int index = 0;
     while (index < clientCount) {
-      clients[index].write(data);
       if (clients[index].active()) {
+        clients[index].write(data);
         index++;
       } else {
         removeIndex(index);
