You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/08/08 20:17:56 UTC
[6/8] git commit: SLIDER-302 reorder constructors for IDE subclassing
ease
SLIDER-302 reorder constructors for IDE subclassing ease
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/cf2aa70e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/cf2aa70e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/cf2aa70e
Branch: refs/heads/develop
Commit: cf2aa70e49d606a9c2bfee8194b84746166b835a
Parents: b7b9a15
Author: Steve Loughran <st...@apache.org>
Authored: Fri Aug 8 19:16:55 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Aug 8 19:16:55 2014 +0100
----------------------------------------------------------------------
.../slider/server/appmaster/actions/AsyncAction.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/cf2aa70e/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/AsyncAction.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/AsyncAction.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/AsyncAction.java
index a755064..5e325a0 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/AsyncAction.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/AsyncAction.java
@@ -43,6 +43,13 @@ public abstract class AsyncAction implements Delayed {
}
protected AsyncAction(String name,
+ int delayMillis) {
+ this.name = name;
+ this.nanos = convertAndOffset(delayMillis);
+ attrs = EnumSet.noneOf(ActionAttributes.class);
+ }
+
+ protected AsyncAction(String name,
int delayMillis, EnumSet<ActionAttributes> attrs) {
this.name = name;
this.nanos = convertAndOffset(delayMillis);
@@ -56,13 +63,6 @@ public abstract class AsyncAction implements Delayed {
Collections.addAll(attrs, attributes);
}
- protected AsyncAction(String name,
- int delayMillis) {
- this.name = name;
- this.nanos = convertAndOffset(delayMillis);
- attrs = EnumSet.noneOf(ActionAttributes.class);
- }
-
private long convertAndOffset(int delay) {
return now() + TimeUnit.NANOSECONDS.convert(delay, TimeUnit.MILLISECONDS);
}