This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
The following commit(s) were added to refs/heads/master by this push: new 6d04777 [SCB-805] If the node time of alpha and omega are not same, the transaction could be aborted 6d04777 is described below commit 6d0477724cdb5f0a890cd63ec99871bd635e3ee1 Author: jeremyxu2010 <jeremyxu2...@gmail.com> AuthorDate: Mon Aug 6 10:00:20 2018 +0800 [SCB-805] If the node time of alpha and omega are not same, the transaction could be aborted --- .../apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java index a3137b4..1146819 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java @@ -78,7 +78,7 @@ class GrpcTxEventEndpointImpl extends TxEventServiceImplBase { boolean ok = txConsistentService.handle(new TxEvent( message.getServiceName(), message.getInstanceId(), - new Date(message.getTimestamp()), + new Date(), message.getGlobalTxId(), message.getLocalTxId(), message.getParentTxId().isEmpty() ? null : message.getParentTxId(),