From 73ebd3e0b1039d9509499f9953424e07286ea50d Mon Sep 17 00:00:00 2001
From: Stephan Ewen <sewen@apache.org>
Date: Wed, 17 Sep 2014 13:04:04 +0200
Subject: [PATCH] Fix Java6 errors in AbstractID, pull JobManager changes into
 YARN app master

---
 .../org/apache/flink/yarn/appMaster/ApplicationMaster.java    | 2 +-
 .../src/main/java/org/apache/flink/runtime/AbstractID.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/ApplicationMaster.java b/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/ApplicationMaster.java
index afda8e08def..3a7701bc14c 100644
--- a/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/ApplicationMaster.java
+++ b/flink-addons/flink-yarn/src/main/java/org/apache/flink/yarn/appMaster/ApplicationMaster.java
@@ -486,7 +486,7 @@ public class ApplicationMaster implements YARNClientMasterProtocol {
 			amStatus.setNumSlots(0);
 		} else {
 			amStatus.setNumTaskManagers(jobManager.getNumberOfTaskManagers());
-			amStatus.setNumSlots(jobManager.getAvailableSlots());
+			amStatus.setNumSlots(jobManager.getTotalNumberOfRegisteredSlots());
 		}
 		amStatus.setMessageCount(messages.size());
 		amStatus.setFailed(isFailed);
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/AbstractID.java b/flink-runtime/src/main/java/org/apache/flink/runtime/AbstractID.java
index e651f6c63dd..0834222fe73 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/AbstractID.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/AbstractID.java
@@ -199,8 +199,8 @@ public class AbstractID implements IOReadableWritable, Comparable<AbstractID>, j
 	
 	@Override
 	public int compareTo(AbstractID o) {
-		int diff1 = Long.compare(this.upperPart, o.upperPart);
-		int diff2 = Long.compare(this.lowerPart, o.lowerPart);
+		int diff1 = (this.upperPart < o.upperPart) ? -1 : ((this.upperPart == o.upperPart) ? 0 : 1);
+		int diff2 = (this.lowerPart < o.lowerPart) ? -1 : ((this.lowerPart == o.lowerPart) ? 0 : 1);
 		return diff1 == 0 ? diff2 : diff1;
 	}
 }
-- 
GitLab