提交 f5768f1d 编写于 作者: K kohsuke

[FIXED HUDSON-2623] Removed JDK6 dependency

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@13244 71c3de6d-444a-0410-be80-ed276b4c234a
上级 51562d0e
package hudson.model;
import hudson.Util;
import hudson.util.TimeUnit2;
import hudson.security.ACL;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
......@@ -204,7 +205,7 @@ public class Executor extends Thread implements ModelObject {
return d*10 < elapsed;
} else {
// if no ETA is available, a build taking longer than a day is considered stuck
return TimeUnit.MILLISECONDS.toHours(elapsed)>24;
return TimeUnit2.MILLISECONDS.toHours(elapsed)>24;
}
}
......
......@@ -8,6 +8,7 @@ import hudson.triggers.SafeTimerTask;
import hudson.triggers.Trigger;
import hudson.util.OneShotEvent;
import hudson.util.XStream2;
import hudson.util.TimeUnit2;
import java.io.BufferedReader;
import java.io.File;
......@@ -923,7 +924,7 @@ public class Queue extends ResourceController implements Saveable {
return elapsed > d*2;
} else {
// more than a day in the queue
return TimeUnit.MILLISECONDS.toHours(elapsed)>24;
return TimeUnit2.MILLISECONDS.toHours(elapsed)>24;
}
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册