HIVE-7997 : Potential null pointer reference in ObjectInspectorUtils#…

…compareTypes() (Navis via Xuefu Zhang) git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1639959 13f79535-47bb-0310-9956-ffa450edef68
akitanaka · Nov 16, 2014 · d202ca0 · d202ca0
1 parent d4efdc3
commit d202ca0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java
@@ -951,9 +951,9 @@ public static boolean compareTypes(ObjectInspector o1, ObjectInspector o2) {
 
       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;
       }