Repository: incubator-slider Updated Branches: refs/heads/develop d82d01fc3 -> cfa66cabc
SLIDER-1157 Code issues - integer handling issues Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/cfa66cab Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/cfa66cab Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/cfa66cab Branch: refs/heads/develop Commit: cfa66cabcab1caf3600bf8e854a19820148bb3cf Parents: d82d01f Author: Gour Saha <gourks...@apache.org> Authored: Sun Jul 17 08:54:31 2016 -0700 Committer: Gour Saha <gourks...@apache.org> Committed: Sun Jul 17 08:54:31 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/slider/client/SliderClient.java | 7 ++++--- .../main/java/org/apache/slider/core/conf/MapOperations.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/cfa66cab/slider-core/src/main/java/org/apache/slider/client/SliderClient.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index 8384fd0..288cff3 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -1711,9 +1711,10 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe if (clusterComponentInstances.containsKey(clientComponentInstanceEntry.getKey())) { // compare instance count now and remove from both maps if they match if (clusterComponentInstances - .get(clientComponentInstanceEntry.getKey()) == clientComponentInstanceEntry - .getValue()) { - clusterComponentInstances.remove(clientComponentInstanceEntry.getKey()); + .get(clientComponentInstanceEntry.getKey()).intValue() == clientComponentInstanceEntry + .getValue().intValue()) { + clusterComponentInstances.remove(clientComponentInstanceEntry + .getKey()); clientComponentInstanceIt.remove(); } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/cfa66cab/slider-core/src/main/java/org/apache/slider/core/conf/MapOperations.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/core/conf/MapOperations.java b/slider-core/src/main/java/org/apache/slider/core/conf/MapOperations.java index 3235a5f..9714a0f 100644 --- a/slider-core/src/main/java/org/apache/slider/core/conf/MapOperations.java +++ b/slider-core/src/main/java/org/apache/slider/core/conf/MapOperations.java @@ -322,7 +322,7 @@ public class MapOperations implements Map<String, String> { basekey, days, hours, minutes, seconds); // calculate total time, schedule the reset if expected - long totalMinutes = days * 24 * 60 + hours * 24 + minutes; + long totalMinutes = (long) days * 24 * 60 + (long) hours * 24 + minutes; return totalMinutes * 60 + seconds; }
