Revert "fix CPGQLServerTests: only read a line if there is something …

…to read"

This reverts commit 143227265e556071bc4e1dc08e3bae8ee91a8930.

console/src/main/scala/io/shiftleft/console/embammonite/UserRunnable.scala

@@ -24,11 +24,11 @@ class UserRunnable(queue: BlockingQueue[Job], writer: PrintWriter, reader: Buffe
           terminate = true
         } else {
           sendQueryToAmmonite(job)
-          stdOutUpToMarker().map { stdOutput =>
-            val errOutput = exhaustStderr()
-            val result = new QueryResult(stdOutput, errOutput, job.uuid)
-            job.observer(result)
-          }
+          val stdoutPair = stdOutUpToMarker()
+          val stdOutput = stdoutPair.get
+          val errOutput = exhaustStderr()
+          val result = new QueryResult(stdOutput, errOutput, job.uuid)
+          job.observer(result)
         }
       }
     } catch {
@@ -51,10 +51,7 @@ class UserRunnable(queue: BlockingQueue[Job], writer: PrintWriter, reader: Buffe
 
   private def stdOutUpToMarker(): Option[String] = {
     var currentOutput: String = ""
-    var line =
-      if (reader.ready) reader.readLine()
-      else null
-
+    var line = reader.readLine()
     while (line != null) {
       if (!line.startsWith(magicEchoSeq) && !line.isEmpty) {
         val uuid = uuidFromLine(line)