[incubator-doris-spark-connector] 04/50: Fix npe in spark-doris-connector when query is complex (#2503)

[morningman]

This is an automated email from the ASF dual-hosted git repository.

morningman pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-doris-spark-connector.git

commit 5d3f6372c462cea030a3172e040843389e7e4236
Author: vinson0526 <vinson0...@users.noreply.github.com>
AuthorDate: Thu Dec 19 14:53:29 2019 +0800

    Fix npe in spark-doris-connector when query is complex (#2503)
---
 src/main/scala/org/apache/doris/spark/rdd/ScalaValueReader.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/org/apache/doris/spark/rdd/ScalaValueReader.scala 
b/src/main/scala/org/apache/doris/spark/rdd/ScalaValueReader.scala
index 16c5feb..163ee16 100644
--- a/src/main/scala/org/apache/doris/spark/rdd/ScalaValueReader.scala
+++ b/src/main/scala/org/apache/doris/spark/rdd/ScalaValueReader.scala
@@ -101,7 +101,7 @@ class ScalaValueReader(partition: PartitionDefinition, 
settings: Settings) {
    * @return true if hax next value
    */
   def hasNext: Boolean = {
-    if ((rowBatch == null || !rowBatch.hasNext) && !eos) {
+    if (!eos && (rowBatch == null || !rowBatch.hasNext)) {
       if (rowBatch != null) {
         offset += rowBatch.getReadRowCount
         rowBatch.close

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org