diff options
| author |   Christophe Closset <cc697w@intl.att.com> | 2017-06-03 09:38:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-06-03 09:38:37 +0000 |
| commit | d8a7aef31a7ff027505072ae75169a8674533caf (patch) | |
| tree | fa351d2474dcc3376c7fe96a453d12d7f4c78f4b /bpmn/MSOCommonBPMN/src/main/java/org | |
| parent | c673383c7f4121d0de83368b981fff68bac34053 (diff) | |
| parent | 413e175d19e46ae7de47ed8199a530eca82e1771 (diff) | |
Merge "Fix WorkflowContext.getDelay() unit conversion"
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main/java/org')
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContext.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContext.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContext.java index 3d7e333fdf..93aa15c59a 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContext.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContext.java @@ -72,7 +72,7 @@ public class WorkflowContext implements Delayed { @Override
public long getDelay(TimeUnit unit) {
// 0 or negative means this object is considered to be expired
- return unit.convert(startTime + timeout - System.currentTimeMillis(), unit);
+ return unit.convert(startTime + timeout - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
}
/**
|