      writePasswordToLocalFile(localPasswordFile, password, conf);
      env.put("hadoop.pipes.shared.secret.location", localPasswordFile);
   
-@@ -120,7 +128,6 @@ class Application<K1 extends WritableComparable, V1 extends Writable,
+@@ -120,7 +128,6 @@
      }
      cmd.add(executable);
      // wrap the command in a stdout/stderr capture

     // we are starting map/reduce task of the pipes job. this is not a cleanup
     // attempt. 
     File stdout = TaskLog.getTaskLogFile(taskid, false, TaskLog.LogName.STDOUT);
diff --git a/pipes/impl/HadoopPipes.cc b/pipes/impl/HadoopPipes.cc
index 964b025..2aab13c 100644
--- a/pipes/impl/HadoopPipes.cc
+++ b/pipes/impl/HadoopPipes.cc
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>

 import org.apache.hadoop.mapreduce.security.SecureShuffleUtils;
 import org.apache.hadoop.mapreduce.security.TokenCache;
 import org.apache.hadoop.mapreduce.security.token.JobTokenIdentifier;
@@ -95,14 +96,21 @@
     env.put("hadoop.pipes.command.port", 
             Integer.toString(serverSocket.getLocalPort()));
     
