SCB-220 fixed rebase conflict

Signed-off-by: seanyinx <sean.yin@huawei.com>
apache · Jan 16, 2018 · d6a8f1b · d6a8f1b
1 parent 3662c5a
commit d6a8f1b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.../alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java b/.../alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxConsistentService.java
@@ -63,6 +63,7 @@ public boolean handle(TxEvent event) {
     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 @@ private void compensateIfAlreadyAborted(TxEvent event) {
 
   private boolean isCompensationScheduled(TxEvent event) {
     return eventsToCompensate.getOrDefault(event.globalTxId(), emptySet()).contains(event.localTxId());
-
-    return true;
   }
 
   private void compensate(TxEvent event) {

diff --git a/...a-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java b/...a-server/src/test/java/org/apache/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
@@ -277,6 +277,7 @@ public void doNotStartSubTxOnFailure() {
     asyncStub.onConnected(serviceConfig, compensateResponseObserver);
 
     blockingStub.onTxEvent(eventOf(TxStartedEvent, localTxId, parentTxId, "service a".getBytes(), "method a"));
+    blockingStub.onTxEvent(someGrpcEvent(TxEndedEvent));
 
     blockingStub.onTxEvent(someGrpcEvent(TxAbortedEvent));