From 8c81f7fc086218e196674ab51447cb277d11048f Mon Sep 17 00:00:00 2001
From: Varun Saxena <varunsaxena@apache.org>
Date: Thu, 19 Jan 2017 10:15:28 +0530
Subject: [PATCH] Addendum for YARN-6064. Support fromId for flowRuns and
 flow/flowRun apps REST API's

(cherry picked from commit c9246f619104bff44dd453a4ffe70104d37fd781)
---
 .../storage/reader/ApplicationEntityReader.java             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/ApplicationEntityReader.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/ApplicationEntityReader.java
index 8a331c3fb49..4e8286dce4a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/ApplicationEntityReader.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/reader/ApplicationEntityReader.java
@@ -375,9 +375,9 @@ class ApplicationEntityReader extends GenericEntityReader {
       Long flowRunId = context.getFlowRunId();
       if (flowRunId == null) {
         AppToFlowRowKey appToFlowRowKey = new AppToFlowRowKey(
-            context.getClusterId(), getFilters().getFromId());
-        FlowContext flowContext =
-            lookupFlowContext(appToFlowRowKey, hbaseConf, conn);
+            getFilters().getFromId());
+        FlowContext flowContext = lookupFlowContext(appToFlowRowKey,
+            context.getClusterId(), hbaseConf, conn);
         flowRunId = flowContext.getFlowRunId();
       }