Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for negative durations #1252

Merged
merged 2 commits into from
Aug 30, 2016
Merged

Fix for negative durations #1252

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f4ba2c
Fix for negative durations
ssalinas Aug 26, 2016
7361342
move Math.max to JavaUtils
ssalinas Aug 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SingularityBase/src/main/java/com/hubspot/mesos/JavaUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@ public static boolean isHttpSuccess(int statusCode) {
private static final String DURATION_FORMAT = "mm:ss.S";

public static String duration(final long start) {
return DurationFormatUtils.formatDuration(System.currentTimeMillis() - start, DURATION_FORMAT);
return DurationFormatUtils.formatDuration(Math.max(System.currentTimeMillis() - start, 0), DURATION_FORMAT);
}

public static String durationFromMillis(final long millis) {
return DurationFormatUtils.formatDuration(millis, DURATION_FORMAT);
return DurationFormatUtils.formatDuration(Math.max(millis, 0), DURATION_FORMAT);
}

public static Thread awaitTerminationWithLatch(final CountDownLatch latch, final String threadNameSuffix, final ExecutorService service, final long millis) {
Expand Down