From da24fde333277a0cbcdf12e24aa0377f1f2cc6e0 Mon Sep 17 00:00:00 2001
From: Robert Kanter <rkanter@apache.org>
Date: Tue, 15 Mar 2016 10:05:10 -0700
Subject: [PATCH] 
 TestResourceLocalizationService.testPublicResourceInitializesLocalDir fails
 Intermittently due to IllegalArgumentException from cleanup (templedf via
 rkanter)

(cherry picked from commit 22ca176dfe125a4f7bf38cc63ab8106c40a7a7ba)
---
 .../localizer/TestResourceLocalizationService.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
index 596f7840fdd..bca07523111 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
@@ -194,7 +194,7 @@ public void cleanup() throws IOException {
     conf = null;
     try {
       FileUtils.deleteDirectory(new File(basedir.toString()));
-    } catch (IOException e) {
+    } catch (IOException | IllegalArgumentException e) {
       // ignore
     }
   }