diff options
| -rw-r--r-- | LICENSE.txt | 4 | ||||
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/workflow/service/WorkflowContext.java | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index cf1d4b6151..c847859a36 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ - * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. * */
\ No newline at end of file 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);
}
/**
|