svn commit: r1352837 - /mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java

[srowen]

Author: srowen
Date: Fri Jun 22 10:47:18 2012
New Revision: 1352837

URL: http://svn.apache.org/viewvc?rev=1352837&view=rev
Log:
MAHOUT-1033 avoid NPE on null conf

Modified:
    mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java

Modified: 
mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java
URL: 
http://svn.apache.org/viewvc/mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java?rev=1352837&r1=1352836&r2=1352837&view=diff
==============================================================================
--- mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java 
(original)
+++ mahout/trunk/core/src/main/java/org/apache/mahout/common/AbstractJob.java 
Fri Jun 22 10:47:18 2012
@@ -612,7 +612,7 @@ public abstract class AbstractJob extend
     // If running in an Oozie workflow as a Java action, need to add the
     // Configuration resource provided by Oozie to this job's config.
     String oozieActionConfXml = System.getProperty("oozie.action.conf.xml");
-    if (oozieActionConfXml != null) {
+    if (oozieActionConfXml != null && conf != null) {
       conf.addResource(new Path("file:///", oozieActionConfXml));
       log.info("Added Oozie action Configuration resource {0} to the Hadoop 
Configuration", oozieActionConfXml);
     }