[incubator-servicecomb-saga] 03/03: SCB-220 fixed rebase conflict

[seanyinx]

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 a063058a505ed29d7482bae66d9f81f00e55d013
Author: seanyinx <sean....@huawei.com>
AuthorDate: Tue Jan 16 09:04:27 2018 +0800

    SCB-220 fixed rebase conflict
    
    Signed-off-by: seanyinx <sean....@huawei.com>
---
 .../org/apache/servicecomb/saga/alpha/core/TxConsistentService.java    | 3 +--
 .../org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java
 
b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java
index 9c592d8..5dc5788 100644
--- 
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java
+++ 
b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java
@@ -63,6 +63,7 @@ public class TxConsistentService {
     eventRepository.save(event);
 
     executor.execute(() -> eventCallbacks.getOrDefault(event.type(), 
DO_NOTHING_CONSUMER).accept(event));
+    return true;
   }
 
   private void compensateIfAlreadyAborted(TxEvent event) {
@@ -77,8 +78,6 @@ public class TxConsistentService {
 
   private boolean isCompensationScheduled(TxEvent event) {
     return eventsToCompensate.getOrDefault(event.globalTxId(), 
emptySet()).contains(event.localTxId());
-
-    return true;
   }
 
   private void compensate(TxEvent event) {
diff --git 
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
 
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
index ab9c7ec..0048311 100644
--- 
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
+++ 
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
@@ -277,6 +277,7 @@ public class AlphaIntegrationTest {
     asyncStub.onConnected(serviceConfig, compensateResponseObserver);
 
     blockingStub.onTxEvent(eventOf(TxStartedEvent, localTxId, parentTxId, 
"service a".getBytes(), "method a"));
+    blockingStub.onTxEvent(someGrpcEvent(TxEndedEvent));
 
     blockingStub.onTxEvent(someGrpcEvent(TxAbortedEvent));
 

-- 
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <commits@servicecomb.apache.org>.