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 2018/03/29 05:47:32 UTC
incubator-gobblin git commit: [GOBBLIN-451] Fix casting error when
exception is thrown in conversion
Repository: incubator-gobblin
Updated Branches:
refs/heads/master 57a6566ac -> 21cc7c048
[GOBBLIN-451] Fix casting error when exception is thrown in conversion
Closes #2324 from jack-moseley/master
Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/21cc7c04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/21cc7c04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/21cc7c04
Branch: refs/heads/master
Commit: 21cc7c048dd3c90b6b97b52216725c4d3bdb5db8
Parents: 57a6566
Author: Jack Moseley <jm...@linkedin.com>
Authored: Wed Mar 28 22:47:27 2018 -0700
Committer: Hung Tran <hu...@linkedin.com>
Committed: Wed Mar 28 22:47:27 2018 -0700
----------------------------------------------------------------------
.../gobblin/converter/avro/JsonIntermediateToAvroConverter.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/21cc7c04/gobblin-core/src/main/java/org/apache/gobblin/converter/avro/JsonIntermediateToAvroConverter.java
----------------------------------------------------------------------
diff --git a/gobblin-core/src/main/java/org/apache/gobblin/converter/avro/JsonIntermediateToAvroConverter.java b/gobblin-core/src/main/java/org/apache/gobblin/converter/avro/JsonIntermediateToAvroConverter.java
index 5b1810b..9e4ae53 100644
--- a/gobblin-core/src/main/java/org/apache/gobblin/converter/avro/JsonIntermediateToAvroConverter.java
+++ b/gobblin-core/src/main/java/org/apache/gobblin/converter/avro/JsonIntermediateToAvroConverter.java
@@ -30,6 +30,7 @@ import org.apache.gobblin.converter.ToAvroConverterBase;
import org.apache.gobblin.converter.avro.JsonElementConversionFactory.RecordConverter;
import org.apache.gobblin.converter.json.JsonSchema;
import org.apache.gobblin.util.AvroUtils;
+import org.apache.gobblin.util.EmptyIterable;
import org.apache.gobblin.util.WriterUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
@@ -77,6 +78,10 @@ public class JsonIntermediateToAvroConverter extends ToAvroConverterBase<JsonArr
public Iterable<GenericRecord> convertRecord(Schema outputSchema, JsonObject inputRecord, WorkUnitState workUnit)
throws DataConversionException {
+ Object record = recordConverter.convert(inputRecord);
+ if (record instanceof EmptyIterable) {
+ return (EmptyIterable<GenericRecord>) record;
+ }
return new SingleRecordIterable<>((GenericRecord) recordConverter.convert(inputRecord));
}