You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/11/16 06:52:11 UTC
svn commit: r1639959 -
/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java
Author: hashutosh
Date: Sun Nov 16 05:52:11 2014
New Revision: 1639959
URL: http://svn.apache.org/r1639959
Log:
HIVE-7997 : Potential null pointer reference in ObjectInspectorUtils#compareTypes() (Navis via Xuefu Zhang)
Modified:
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java
Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java?rev=1639959&r1=1639958&r2=1639959&view=diff
==============================================================================
--- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java (original)
+++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java Sun Nov 16 05:52:11 2014
@@ -951,9 +951,9 @@ public final class ObjectInspectorUtils
if (childFieldsList1 == null && childFieldsList2 == null) {
return true;
- }
-
- if (childFieldsList1.size() != childFieldsList2.size()) {
+ } else if (childFieldsList1 == null || childFieldsList2 == null) {
+ return false;
+ } else if (childFieldsList1.size() != childFieldsList2.size()) {
return false;
}