Misc

Author: Aaron

build.gradle

@@ -4,7 +4,7 @@ subprojects {
     apply plugin: 'maven'
 
     group 'org.iot-dsa'
-    version '0.31.0'
+    version '0.31.1'
 
     sourceCompatibility = 1.6
     targetCompatibility = 1.6

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/DSSession.java

@@ -336,7 +336,11 @@ protected void setAckToSend(int ackToSend) {
     }
 
     protected boolean waitingForAcks() {
-        return getMissingAcks() > 8;
+        boolean ret = getMissingAcks() > 8;
+        if (ret) {
+            debug(debug() ? "Waiting for " + getMissingAcks() + " acks" : null);
+        }
+        return ret;
     }
 
     ///////////////////////////////////////////////////////////////////////////

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/responder/DSInboundSubscription.java

@@ -69,15 +69,11 @@ protected DSInboundSubscription(DSInboundSubscriptions manager,
     public boolean canWrite(DSSession session) {
         if (ackRequired > 0) {
             int last = session.getAckRcvd();
-            if (last > ackRequired) {
+            if (last >= ackRequired) {
                 return true;
             }
             //is the last ack is so far away that we have a rollover.
-            boolean b = ((ackRequired - 10000000) > last);
-            //if (!b) { //TODO
-                //System.out.print('.');
-            //}
-            return b;
+            return ((ackRequired - 10000000) > last);
         }
         return true;
     }
@@ -232,15 +228,17 @@ protected void write(DSSession session, MessageWriter writer, StringBuilder buf)
             ackRequired = session.getMessageId();
         }
         Update update = dequeue();
-        int count = 0;
+        int count = 500;
         while (update != null) {
             write(update, writer, buf);
             if ((qos == 0) || session.shouldEndMessage()) {
                 break;
-            } else if (++count > 1024) {
-                break;
             }
-            update = dequeue();
+            if (--count >= 0) {
+                update = dequeue();
+            } else {
+                update = null;
+            }
         }
         synchronized (this) {
             if (updateHead == null) {

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/protocol/v1/DS1ConnectionInit.java

@@ -29,8 +29,8 @@ public class DS1ConnectionInit extends DSNode {
     ///////////////////////////////////////////////////////////////////////////
 
     private static final String DSA_VERSION = "1.1.2";
-    private static final String[] SUPPORTED_FORMATS = new String[]{"msgpack", "json"};
-    //private static final String[] SUPPORTED_FORMATS = new String[]{"json"};
+    //private static final String[] SUPPORTED_FORMATS = new String[]{"msgpack", "json"};
+    private static final String[] SUPPORTED_FORMATS = new String[]{"json"};
 
     private String BROKER_REQ = "Broker Request";
     private String BROKER_RES = "Broker Response";