commit a65bdbf5aaa3c1138caa0dd55d3fe9c4bca7e014
author Eugene Tarassov <eugenet@xilinx.com> Thu Dec 13 12:13:35 2018 -0800
committer Eugene Tarassov <eugenet@xilinx.com> Thu Dec 13 12:13:35 2018 -0800
tree bd01b3f9cd7dfa48607d84d751d9f16633855abb
parent d368c18ad59c03702d8a5e1a8a1f4b3a73f22710

TCF Core: improved TCF over HTTP implementation

plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/core/ChannelHTTP.java

diff --git a/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/core/ChannelHTTP.java b/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/core/ChannelHTTP.java
index 7f5f419..2f295a4 100644
--- a/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/core/ChannelHTTP.java
+++ b/plugins/org.eclipse.tcf.core/src/org/eclipse/tcf/core/ChannelHTTP.java
@@ -77,6 +77,7 @@
                 while (!stopped) {
                     String s = inp.readLine();
                     if (s == null) break;
+                    if (s.length() > 0) continue;
                     Protocol.invokeLater(new Runnable() {
                         IToken cmd;
                         @Override
@@ -108,11 +109,11 @@
     @Override
     protected void write(int n) throws IOException {
         if (n < 0) {
-            if (n == EOM && wr_cnt > 0) {
+            if (wr_cnt > 0) {
                 try {
                     int i = 0;
                     char type = (char)wr_buf[i++];
-                    while (i < wr_cnt && wr_buf[i] == 0) i++;
+                    while (i >= wr_cnt || wr_buf[i++] != 0) break;
                     switch (type) {
                     case 'C':
                         sendCommand(i);
@@ -160,6 +161,7 @@
     }
 
     private String getArgs(int i) throws Exception {
+        if (i >= wr_cnt) return null;
         StringBuffer args = new StringBuffer();
         while (i < wr_cnt) {
             if (args.length() > 0) args.append('&');
@@ -185,17 +187,17 @@
         byte[] t = new byte[i - p];
         System.arraycopy(wr_buf, p, t, 0, t.length);
         Token token = new Token(t);
-        while (wr_buf[i] == 0) i++;
+        i++;
 
         p = i;
         while (wr_buf[i] != 0) i++;
         String service = new String(wr_buf, p, i - p, "UTF-8");
-        while (wr_buf[i] == 0) i++;
+        i++;
 
         p = i;
         while (wr_buf[i] != 0) i++;
         String command = new String(wr_buf, p, i - p, "UTF-8");
-        while (i < wr_buf.length && wr_buf[i] == 0) i++;
+        i++;
 
         sendRequest(token, service, command, getArgs(i));
     }