Return-Path: 
 <commits-return-5426-apmail-pig-commits-archive=pig.apache.org@pig.apache.org>
X-Original-To: apmail-pig-commits-archive@www.apache.org
Delivered-To: apmail-pig-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 6203BDB10
	for <apmail-pig-commits-archive@www.apache.org>;
 Thu, 18 Oct 2012 23:29:13 +0000 (UTC)
Received: (qmail 88695 invoked by uid 500); 18 Oct 2012 23:29:13 -0000
Delivered-To: apmail-pig-commits-archive@pig.apache.org
Received: (qmail 88657 invoked by uid 500); 18 Oct 2012 23:29:13 -0000
Mailing-List: contact commits-help@pig.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@pig.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@pig.apache.org>
List-Post: <mailto:commits@pig.apache.org>
List-Id: <commits.pig.apache.org>
Reply-To: dev@pig.apache.org
Delivered-To: mailing list commits@pig.apache.org
Received: (qmail 88644 invoked by uid 99); 18 Oct 2012 23:29:13 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Oct 2012 23:29:13 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Oct 2012 23:29:10 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 9C2E323888EA
	for <commits@pig.apache.org>; Thu, 18 Oct 2012 23:28:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1399922 - in /pig/branches/branch-0.11: CHANGES.txt
 src/org/apache/pig/builtin/COUNT.java
 test/org/apache/pig/test/TestBuiltin.java
Date: Thu, 18 Oct 2012 23:28:26 -0000
To: commits@pig.apache.org
From: jcoveney@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121018232826.9C2E323888EA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jcoveney
Date: Thu Oct 18 23:28:26 2012
New Revision: 1399922

URL: http://svn.apache.org/viewvc?rev=1399922&view=rev
Log:
PIG-1283: COUNT on null bag causes failure (analog.sony via jcoveney)

Modified:
    pig/branches/branch-0.11/CHANGES.txt
    pig/branches/branch-0.11/src/org/apache/pig/builtin/COUNT.java
    pig/branches/branch-0.11/test/org/apache/pig/test/TestBuiltin.java

Modified: pig/branches/branch-0.11/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.11/CHANGES.txt?rev=1399922&r1=1399921&r2=1399922&view=diff
==============================================================================
--- pig/branches/branch-0.11/CHANGES.txt (original)
+++ pig/branches/branch-0.11/CHANGES.txt Thu Oct 18 23:28:26 2012
@@ -306,6 +306,8 @@ OPTIMIZATIONS
 
 BUG FIXES
 
+PIG-1283: COUNT on null bag causes failure (analog.sony via jcoveney)
+
 PIG-2958: Pig tests do not appear to have a logger attached (daijyc via jcoveney)
 
 PIG-2926: TestPoissonSampleLoader failing on rhel environment (jcoveney)

Modified: pig/branches/branch-0.11/src/org/apache/pig/builtin/COUNT.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.11/src/org/apache/pig/builtin/COUNT.java?rev=1399922&r1=1399921&r2=1399922&view=diff
==============================================================================
--- pig/branches/branch-0.11/src/org/apache/pig/builtin/COUNT.java (original)
+++ pig/branches/branch-0.11/src/org/apache/pig/builtin/COUNT.java Thu Oct 18 23:28:26 2012
@@ -58,6 +58,9 @@ public class COUNT extends EvalFunc<Long
     public Long exec(Tuple input) throws IOException {
         try {
             DataBag bag = (DataBag)input.get(0);
+            if(bag==null)
+                return null;
+
             Iterator it = bag.iterator();
             long cnt = 0;
             while (it.hasNext()){

Modified: pig/branches/branch-0.11/test/org/apache/pig/test/TestBuiltin.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.11/test/org/apache/pig/test/TestBuiltin.java?rev=1399922&r1=1399921&r2=1399922&view=diff
==============================================================================
--- pig/branches/branch-0.11/test/org/apache/pig/test/TestBuiltin.java (original)
+++ pig/branches/branch-0.11/test/org/apache/pig/test/TestBuiltin.java Thu Oct 18 23:28:26 2012
@@ -18,6 +18,7 @@
 package org.apache.pig.test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.io.File;
@@ -1001,6 +1002,17 @@ public class TestBuiltin {
     }
 
     @Test
+    public void testCOUNTBagNullCheck() throws Exception{
+
+        DataBag b = null;
+        Tuple t = tupleFactory.getInstance().newTuple(b);
+
+        EvalFunc<Long> count = new COUNT();
+        assertNull(count.exec(t));
+       }
+
+
+    @Test
     public void testCount_ValidNumberOfArguments_WithoutInputSchema_One() throws Exception {
          File inputFile = createCountInputFile();
          try {