Merge branch 'master'

59b5832c · Claes Sjofors · 5f92beb5 · 93cba254 · 59b5832c
Commit 59b5832c authored Jul 05, 2019 by Claes Sjofors
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

java/jpwr/rt/src/GdhWebSocketServer.java java/jpwr/rt/src/GdhWebSocketServer.java +6 -6

No files found.
--- a/java/jpwr/rt/src/GdhWebSocketServer.java
+++ b/java/jpwr/rt/src/GdhWebSocketServer.java
@@ -986,9 +986,9 @@ public class GdhWebSocketServer
 		      i += 4;
 		      int elements = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
 		      i += 4;
-		      int nameSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
+		      int nameSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8);
-		      i += 4;
+		      i += 2;
-		      String attrName = new String( value, i, nameSize); 
+		      String attrName = new String( value, i, nameSize);
 		      attrName = checkAttrName( attrName);
 		      if ( attrName != null) {
 			  Sub ret = this.refObjectInfo(attrName, threadNumber, refId, elements);
@@ -1093,9 +1093,9 @@ public class GdhWebSocketServer
 			  i += 4;
 			  int elements = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
 			  i += 4;
-			  int nameSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8) + ((value[i+2] & 0xFF) << 16) + ((value[i+3] & 0xFF) << 24);
+			  int nameSize = ((value[i] & 0xFF) << 0) + ((value[i+1] & 0xFF) << 8);
-			  i += 4;
+			  i += 2;
-			  String attrName = new String( value, i, nameSize); 
+			  String attrName = new String( value, i, nameSize);
 			  attrName = checkAttrName( attrName);
 			  if ( attrName != null) {
 			      Sub ret = this.refObjectInfo(attrName, threadNumber, refId, elements);