This is an automated email from the ASF dual-hosted git repository. seanyinx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 3531db6ab7f982ea9ec64e94f4d1c9d8e4803b61 Author: seanyinx <[email protected]> AuthorDate: Fri Dec 29 12:53:50 2017 +0800 SCB-138 fixed test failure by running grpc in a dedicated thread Signed-off-by: seanyinx <[email protected]> --- .../src/main/java/io/servicecomb/saga/alpha/server/AlphaConfig.java | 5 ++++- .../io/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/AlphaConfig.java b/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/AlphaConfig.java index a453c81..58ba14a 100644 --- a/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/AlphaConfig.java +++ b/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/AlphaConfig.java @@ -18,6 +18,9 @@ package io.servicecomb.saga.alpha.server; import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executors; + +import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -44,7 +47,7 @@ class AlphaConfig { TxEventRepository eventRepository = new SpringTxEventRepository(eventRepo); ServerStartable startable = buildGrpc(port, omegaCallback, eventRepository); - CompletableFuture.runAsync(startable::start); + new Thread(startable::start).start(); return eventRepository; } diff --git a/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java b/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java index 278183c..41e5bbe 100644 --- a/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java +++ b/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java @@ -43,7 +43,7 @@ class GrpcTxEventEndpointImpl extends TxEventServiceImplBase { new Date(message.getTimestamp()), message.getGlobalTxId(), message.getLocalTxId(), - message.getParentTxId(), + message.getParentTxId().isEmpty()? null : message.getParentTxId(), message.getType(), message.getPayloads().toByteArray() )); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
