### Eclipse Workspace Patch 1.0 #P hive_trunk Index: ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java =================================================================== --- ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java (revision 1621727) +++ ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFAverage.java (working copy) @@ -174,12 +174,15 @@ long cnt = myagg.count; if (ss.numPreceding != BoundarySpec.UNBOUNDED_AMOUNT && (ss.numRows - ss.numFollowing) >= (ss.numPreceding + 1)) { - Object[] o = ss.intermediateVals.remove(0); - if (o != null) { + + Object[] o = null; + if( ss.intermediateVals.remove(0) != null){ + o = ss.intermediateVals.remove(0); Double d = (Double) o[0]; r = r == null ? null : r - d; cnt = cnt - ((Long) o[1]); - } + } + } return r == null ? null : new DoubleWritable(r / cnt);