Index: serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java (revision f2303eb73c9d7a343bd79c4ba5010d066803459e) +++ serde/src/java/org/apache/hadoop/hive/serde2/lazy/objectinspector/LazyMapObjectInspector.java (revision ) @@ -90,10 +90,7 @@ @Override public Object getMapValueElement(Object data, Object key) { - if (data == null) { - return null; - } - return ((LazyMap) data).getMapValueElement(key); + return ((data==null || key == null)? null : ((LazyMap) data).getMapValueElement(key)); } @Override Index: ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java (revision f2303eb73c9d7a343bd79c4ba5010d066803459e) +++ ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcStruct.java (revision ) @@ -346,10 +346,7 @@ @Override public Object getMapValueElement(Object map, Object key) { - if (map == null) { - return null; - } - return ((Map) map).get(key); + return ((map == null || key == null)? null : ((Map) map).get(key)); } @Override