You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2013/09/09 19:16:37 UTC
svn commit: r1521196 - in /hive/branches/branch-0.12: ./
ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
Author: brock
Date: Mon Sep 9 17:16:36 2013
New Revision: 1521196
URL: http://svn.apache.org/r1521196
Log:
HIVE-4003 - NullPointerException in exec.Utilities (Mark Grover via Brock Noland)
Modified:
hive/branches/branch-0.12/ (props changed)
hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
Propchange: hive/branches/branch-0.12/
------------------------------------------------------------------------------
Merged /hive/trunk:r1521188
Modified: hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java?rev=1521196&r1=1521195&r2=1521196&view=diff
==============================================================================
--- hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java (original)
+++ hive/branches/branch-0.12/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java Mon Sep 9 17:16:36 2013
@@ -261,9 +261,8 @@ public final class Utilities {
assert path != null;
gWork = gWorkMap.get(path);
if (gWork == null) {
- String jtConf = ShimLoader.getHadoopShims().getJobLauncherRpcAddress(conf);
Path localPath;
- if (jtConf.equals("local")) {
+ if (ShimLoader.getHadoopShims().isLocalMode(conf)) {
localPath = path;
} else {
localPath = new Path(name);