You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jd...@apache.org on 2014/04/24 03:12:56 UTC
svn commit: r1589553 -
/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMkCollectionEvaluator.java
Author: jdere
Date: Thu Apr 24 01:12:56 2014
New Revision: 1589553
URL: http://svn.apache.org/r1589553
Log:
HIVE-6922: NullPointerException in collect_set() UDAF (Sun Rui via Jason Dere)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMkCollectionEvaluator.java
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMkCollectionEvaluator.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMkCollectionEvaluator.java?rev=1589553&r1=1589552&r2=1589553&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMkCollectionEvaluator.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFMkCollectionEvaluator.java Thu Apr 24 01:12:56 2014
@@ -137,8 +137,10 @@ public class GenericUDAFMkCollectionEval
throws HiveException {
MkArrayAggregationBuffer myagg = (MkArrayAggregationBuffer) agg;
List<Object> partialResult = (ArrayList<Object>) internalMergeOI.getList(partial);
- for(Object i : partialResult) {
- putIntoCollection(i, myagg);
+ if (partialResult != null) {
+ for(Object i : partialResult) {
+ putIntoCollection(i, myagg);
+ }
}
}