svn commit: r1626332 - /hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java

[omalley]

Author: omalley
Date: Fri Sep 19 21:04:47 2014
New Revision: 1626332

URL: http://svn.apache.org/r1626332
Log:
HIVE-6936. Missed one part of the change in the previous commit.

Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java?rev=1626332&r1=1626331&r2=1626332&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java 
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java Fri 
Sep 19 21:04:47 2014
@@ -2279,8 +2279,10 @@ public final class Utilities {
     Properties tblProperties = tbl.getProperties();
     for(String name: tblProperties.stringPropertyNames()) {
       if (job.get(name) == null) {
-        job.set(name,
-            StringEscapeUtils.escapeJava((String) tblProperties.get(name)));
+        String val = (String) tblProperties.get(name);
+        if (val != null) {
+          job.set(name, StringEscapeUtils.escapeJava(val));
+        }
       }
     }
     Map<String, String> jobProperties = tbl.getJobProperties();