You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gobblin.apache.org by hu...@apache.org on 2020/03/25 01:01:38 UTC
[incubator-gobblin] branch master updated: [GOBBLIN-1097]
ResultChainingIterator.add should check if the argument iterator is null[]
This is an automated email from the ASF dual-hosted git repository.
hutran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git
The following commit(s) were added to refs/heads/master by this push:
new 3395625 [GOBBLIN-1097] ResultChainingIterator.add should check if the argument iterator is null[]
3395625 is described below
commit 33956259291e81a2d4e4a32c0ea6db7db3d8ca89
Author: Alex Li <al...@linkedin.com>
AuthorDate: Tue Mar 24 18:01:30 2020 -0700
[GOBBLIN-1097] ResultChainingIterator.add should check if the argument iterator is null[]
Closes #2938 from arekusuri/GOBBLIN-1097-fix-
iterator-null
---
.../java/org/apache/gobblin/salesforce/ResultChainingIterator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/ResultChainingIterator.java b/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/ResultChainingIterator.java
index 0ab3629..fa17344 100644
--- a/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/ResultChainingIterator.java
+++ b/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/ResultChainingIterator.java
@@ -45,7 +45,9 @@ public class ResultChainingIterator implements Iterator<JsonElement> {
}
public void add(Iterator<JsonElement> iter) {
- this.iter = Iterators.concat(this.iter, iter);
+ if (iter != null) {
+ this.iter = Iterators.concat(this.iter, iter);
+ }
}
@Override