diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/FlowRunEntity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/FlowRunEntity.java
index 410a1bf0e6f..5c666cdeb7b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/FlowRunEntity.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/timelineservice/FlowRunEntity.java
@@ -100,7 +100,7 @@ public class FlowRunEntity extends HierarchicalTimelineEntity {
 
   public long getRunId() {
     Object runId = getInfo().get(FLOW_RUN_ID_INFO_KEY);
-    return runId == null ? 0L : (Long) runId;
+    return runId == null ? 0L : ((Number) runId).longValue();
   }
 
   public void setRunId(long runId) {
@@ -117,7 +117,7 @@ public class FlowRunEntity extends HierarchicalTimelineEntity {
 
   public long getMaxEndTime() {
     Object time = getInfo().get(FLOW_RUN_END_TIME);
-    return time == null ? 0L : (Long)time;
+    return time == null ? 0L : ((Number) time).longValue();
   }
 
   public void setMaxEndTime(long endTime) {