diff options
| author |   vidhyasree <sn141y@att.com> | 2018-06-26 11:55:24 -0400 |
|---|---|---|
| committer | Santoshi Vidhyasree Nerella <sn141y@att.com> | 2018-06-26 19:04:33 +0000 |
| commit | 902fc7abbb42e062ee4a08e84521c3e505fe012f (patch) | |
| tree | 1f82164e7fb96f6cee28b2b76a438669e6c45486 /appc-dispatcher | |
| parent | a0e26d8b474fa91e6f4ec6bcbb2c53384821bd7a (diff) | |
Fix for invalid locking approach
Issue-ID: APPC-1019
Change-Id: I738c4ad72c29f494488a3fe3657243927797e2b5
Signed-off-by: vidhyasree <sn141y@att.com>
Diffstat (limited to 'appc-dispatcher')
2 files changed, 5 insertions, 6 deletions
diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/CommandTask.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/CommandTask.java index 965664429..458814dab 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/CommandTask.java +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/onap/appc/executor/impl/CommandTask.java @@ -48,8 +48,6 @@ import java.net.InetAddress; import java.util.UUID; import static com.att.eelf.configuration.Configuration.*; -import static com.att.eelf.configuration.Configuration.MDC_SERVICE_INSTANCE_ID; -import static com.att.eelf.configuration.Configuration.MDC_SERVICE_NAME; /** * This abstract class is base class for all Command tasks. All command task must inherit this class. diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestHandlerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestHandlerImpl.java index 9d6c88883..aa6d203a5 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestHandlerImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestHandlerImpl.java @@ -74,7 +74,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; import java.util.UUID; - +import java.util.TimeZone; import static com.att.eelf.configuration.Configuration.MDC_INSTANCE_UUID; import static com.att.eelf.configuration.Configuration.MDC_KEY_REQUEST_ID; import static com.att.eelf.configuration.Configuration.MDC_SERVER_FQDN; @@ -226,11 +226,11 @@ public abstract class AbstractRequestHandlerImpl implements RequestHandler { } updateColumns.put(TransactionConstants.TRANSACTION_ATTRIBUTES.STATE, record.getRequestState()); updateColumns.put(TransactionConstants.TRANSACTION_ATTRIBUTES.RESULT_CODE, - String.valueOf(record.getResultCode())); + String.valueOf(record.getResultCode())); if (RequestStatus.valueOf(record.getRequestState()).isTerminal()) { - Date endTime = new Date(System.currentTimeMillis()); + Date endTime = new Date(); updateColumns.put(TransactionConstants.TRANSACTION_ATTRIBUTES.END_TIME, - dateToStringConverterMillis(endTime)); + dateToStringConverterMillis(endTime)); } try { transactionRecorder.update(record.getTransactionId(), updateColumns); @@ -461,6 +461,7 @@ public abstract class AbstractRequestHandlerImpl implements RequestHandler { public static String dateToStringConverterMillis(Date date) { SimpleDateFormat customDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); + customDate.setTimeZone(TimeZone.getTimeZone("UTC")); if (date != null) { return customDate.format(date); } |