svn commit: r1077137 [5/5] - in /hadoop/common/branches/branch-0.20-security-patches: ./ .eclipse.templates/ ivy/ src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ src/contrib/hdfsproxy/src/test/org/apache/hadoop/hdfsproxy/ src/contrib/stream...

[omalley]

Modified: 
hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java?rev=1077137&r1=1077136&r2=1077137&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/DistCp.java
 Fri Mar  4 03:44:54 2011
@@ -1005,7 +1005,11 @@ public class DistCp implements Tool {
     final String randomId = getRandomId();
     JobClient jClient = new JobClient(jobConf);
     Path stagingArea;
-    stagingArea = JobSubmissionFiles.getStagingDir(jClient, conf);
+    try {
+      stagingArea = JobSubmissionFiles.getStagingDir(jClient, conf);
+    } catch (InterruptedException e) {
+      throw new IOException(e);
+    }
     
     Path jobDirectory = new Path(stagingArea + NAME + "_" + randomId);
     FsPermission mapredSysPerms =

Modified: 
hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java?rev=1077137&r1=1077136&r2=1077137&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security-patches/src/tools/org/apache/hadoop/tools/HadoopArchives.java
 Fri Mar  4 03:44:54 2011
@@ -362,8 +362,12 @@ public class HadoopArchives implements T
     conf.set(DST_DIR_LABEL, outputPath.toString());
     final String randomId = DistCp.getRandomId();
     Path stagingArea;
-    stagingArea = JobSubmissionFiles.getStagingDir(new JobClient(conf),
-          conf);
+    try {
+      stagingArea = JobSubmissionFiles.getStagingDir(new JobClient(conf),
+            conf);
+    } catch (InterruptedException e) {
+      throw new IOException(e);
+    }
     Path jobDirectory = new Path(stagingArea,
                                NAME + "_" + randomId);
     FsPermission mapredSysPerms =