Return-Path: <commits-return-8012-archive-asf-public=cust-asf.ponee.io@pig.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 283D5200C0E
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed,  1 Feb 2017 22:28:01 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 26F8C160B5E; Wed,  1 Feb 2017 21:28:01 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 9EA4B160B46
	for <archive-asf-public@cust-asf.ponee.io>; Wed,  1 Feb 2017 22:28:00 +0100 (CET)
Received: (qmail 24289 invoked by uid 500); 1 Feb 2017 21:27:59 -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 24278 invoked by uid 99); 1 Feb 2017 21:27:59 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2017 21:27:59 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 3CE8D3A0A4E
	for <commits@pig.apache.org>; Wed,  1 Feb 2017 21:27:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1781314 - in /pig/trunk: CHANGES.txt
 src/org/apache/pig/impl/util/JarManager.java
Date: Wed, 01 Feb 2017 21:27:58 -0000
To: commits@pig.apache.org
From: knoguchi@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20170201212759.3CE8D3A0A4E@svn01-us-west.apache.org>
archived-at: Wed, 01 Feb 2017 21:28:01 -0000

Author: knoguchi
Date: Wed Feb  1 21:27:58 2017
New Revision: 1781314

URL: http://svn.apache.org/viewvc?rev=1781314&view=rev
Log:
PIG-5120: Let tez_local mode run without a jar file (knoguchi)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/impl/util/JarManager.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1781314&r1=1781313&r2=1781314&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Feb  1 21:27:58 2017
@@ -34,6 +34,8 @@ PIG-5067: Revisit union on numeric type
  
 IMPROVEMENTS
 
+PIG-5120: Let tez_local mode run without a jar file (knoguchi)
+
 PIG-3851: Upgrade jline to 2.11 (daijy)
 
 PIG-4963: Add a Bloom join (rohini)

Modified: pig/trunk/src/org/apache/pig/impl/util/JarManager.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/impl/util/JarManager.java?rev=1781314&r1=1781313&r2=1781314&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/impl/util/JarManager.java (original)
+++ pig/trunk/src/org/apache/pig/impl/util/JarManager.java Wed Feb  1 21:27:58 2017
@@ -207,7 +207,7 @@ public class JarManager {
         List<String> defaultJars = new ArrayList<String>();
         for (DefaultPigPackages pkgToSend : DefaultPigPackages.values()) {
             String jar = findContainingJar(pkgToSend.getPkgClass());
-            if (!defaultJars.contains(jar)) {
+            if (jar != null && !defaultJars.contains(jar)) {
                 defaultJars.add(jar);
             }
         }