Fix Java6 errors in AbstractID, pull JobManager changes into YARN app…

… master
VonRosenchild · Sep 20, 2014 · 73ebd3e · 73ebd3e
1 parent cdee875
commit 73ebd3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -486,7 +486,7 @@ public ApplicationMasterStatus getAppplicationMasterStatus() {
  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
@@ -199,8 +199,8 @@ public String toString() {
 
  @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;
  }
 }