diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/avro/TypeInfoToSchema.java b/serde/src/java/org/apache/hadoop/hive/serde2/avro/TypeInfoToSchema.java index 4f8b05f5aeac..b4f219497e5c 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/avro/TypeInfoToSchema.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/avro/TypeInfoToSchema.java @@ -17,6 +17,7 @@ */ package org.apache.hadoop.hive.serde2.avro; +import org.apache.avro.JsonProperties; import org.apache.avro.Schema; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo; @@ -73,7 +74,7 @@ public Schema convert(List columnNames, List columnTypes, } private Schema.Field createAvroField(String name, TypeInfo typeInfo, String comment) { - return new Schema.Field(name, createAvroSchema(typeInfo), comment, null); + return new Schema.Field(name, createAvroSchema(typeInfo), comment, JsonProperties.NULL_VALUE); } private Schema createAvroSchema(TypeInfo typeInfo) { @@ -235,7 +236,7 @@ private Schema createAvroArray(TypeInfo typeInfo) { private List getFields(Schema.Field schemaField) { List fields = new ArrayList(); - JsonNode nullDefault = JsonNodeFactory.instance.nullNode(); + JsonProperties.Null nullDefault = JsonProperties.NULL_VALUE; if (schemaField.schema().getType() == Schema.Type.RECORD) { for (Schema.Field field : schemaField.schema().getFields()) { fields.add(new Schema.Field(field.name(), field.schema(), field.doc(), nullDefault));