Fix various NPE and other bugs

jkreps · Nov 29, 2010 · 39d4adc · 39d4adc
1 parent ede2c0d
commit 39d4adc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/azkaban/src/java/azkaban/flow/CachingFlowManager.java b/azkaban/src/java/azkaban/flow/CachingFlowManager.java
@@ -103,6 +103,10 @@ public ExecutableFlow createNewExecutableFlow(String name)
     {
         final ExecutableFlow retVal = baseManager.createNewExecutableFlow(name);
 
+        if (retVal == null) {
+            return null;
+        }
+
         return new WrappingExecutableFlow(retVal){
             @Override
             public void execute(Props parentProperties, FlowCallback callback) {

diff --git a/azkaban/src/java/azkaban/jobs/AbstractProcessJob.java b/azkaban/src/java/azkaban/jobs/AbstractProcessJob.java
@@ -109,11 +109,11 @@ public String getCwd() {
 
 
     public Map<String, String> getEnvironmentVariables( ) {
-        return _props.getMapByPrefix(ENV_PREFIX);
+        return getProps().getMapByPrefix(ENV_PREFIX);
     }
 
     public String getWorkingDirectory() {
-        return  _props.getString(WORKING_DIR,  new File(_jobPath).getParent());
+        return  getProps().getString(WORKING_DIR,  new File(_jobPath).getParent());
     }
 
     public Props loadOutputFileProps( File outputPropertiesFile)

diff --git a/azkaban/src/java/azkaban/jobs/JavaProcessJob.java b/azkaban/src/java/azkaban/jobs/JavaProcessJob.java
@@ -120,5 +120,4 @@ protected String createArguments(List<String> arguments, String separator) {
 
 		return "";
 	}
-
 }