From e337512a1218cac6a3d16ff925c6115b014c4d9e Mon Sep 17 00:00:00 2001 From: Prabhu Joseph Date: Wed, 20 Mar 2019 17:09:46 +0530 Subject: [PATCH] YARN-9400 --- .../yarn/server/timeline/EntityGroupFSTimelineStore.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStore.java index 80baf89..300a608 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStore.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStore.java @@ -516,15 +516,11 @@ private static boolean shouldCleanAppLogDir(Path appLogPath, long now, // converts the String to an ApplicationId or null if conversion failed private static ApplicationId parseApplicationId(String appIdStr) { - ApplicationId appId = null; - if (appIdStr.startsWith(ApplicationId.appIdStrPrefix)) { - try { - appId = ApplicationId.fromString(appIdStr); - } catch (IllegalArgumentException e) { - appId = null; - } + try { + return ApplicationId.fromString(appIdStr); + } catch (IllegalArgumentException e) { + return null; } - return appId; } private static ClassLoader createPluginClassLoader( -- 2.7.4 (Apple Git-66)