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
commit 266184e0bb06d1a2c395d1e11759eba29474c2a3 Author: Eric Lee <[email protected]> AuthorDate: Mon Jan 29 14:28:55 2018 +0800 SCB-239 resolve rebase conflicts Signed-off-by: Eric Lee <[email protected]> --- .../saga/omega/transaction/EventAwareInterceptor.java | 2 +- .../saga/omega/transaction/OnceAwareInterceptor.java | 12 +----------- .../saga/omega/transaction/OnceAwareInterceptorTest.java | 3 +-- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/EventAwareInterceptor.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/EventAwareInterceptor.java index 7b71dd4..bb2cca4 100644 --- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/EventAwareInterceptor.java +++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/EventAwareInterceptor.java @@ -35,7 +35,7 @@ public interface EventAwareInterceptor { AlphaResponse preIntercept(String parentTxId, String compensationMethod, int timeout, Object... message); - void postIntercept(String parentTxId, String compensationMethod) throws Throwable; + void postIntercept(String parentTxId, String compensationMethod); void onError(String parentTxId, String compensationMethod, Throwable throwable); } diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/OnceAwareInterceptor.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/OnceAwareInterceptor.java index 2ab7d12..3015a01 100644 --- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/OnceAwareInterceptor.java +++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/saga/omega/transaction/OnceAwareInterceptor.java @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicReference; class OnceAwareInterceptor implements EventAwareInterceptor { private final EventAwareInterceptor interceptor; private final AtomicReference<EventAwareInterceptor> interceptorRef; - private Throwable throwable = null; OnceAwareInterceptor(EventAwareInterceptor interceptor) { this.interceptor = interceptor; @@ -35,11 +34,9 @@ class OnceAwareInterceptor implements EventAwareInterceptor { } @Override - public void postIntercept(String parentTxId, String signature) throws Throwable { + public void postIntercept(String parentTxId, String signature) { if (interceptorRef.compareAndSet(interceptor, NO_OP_INTERCEPTOR)) { interceptor.postIntercept(parentTxId, signature); - } else if (throwable != null) { - throw throwable; } } @@ -49,11 +46,4 @@ class OnceAwareInterceptor implements EventAwareInterceptor { interceptor.onError(parentTxId, signature, throwable); } } - - void onTimeout(String parentTxId, String signature, Throwable throwable) { - if (interceptorRef.compareAndSet(interceptor, NO_OP_INTERCEPTOR)) { - interceptor.onError(parentTxId, signature, throwable); - this.throwable = throwable; - } - } } diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/OnceAwareInterceptorTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/OnceAwareInterceptorTest.java index afdb958..90a133b 100644 --- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/OnceAwareInterceptorTest.java +++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/saga/omega/transaction/OnceAwareInterceptorTest.java @@ -29,7 +29,6 @@ import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; -import org.junit.rules.ExpectedException; public class OnceAwareInterceptorTest { private static final int runningCounts = 1000; @@ -75,7 +74,7 @@ public class OnceAwareInterceptorTest { } @Test - public void invokeEitherOnErrorOrOnTimeoutConcurrently() throws Exception { + public void invokeOnErrorConcurrently() throws Exception { RuntimeException oops = new RuntimeException("oops"); List<Future<?>> futures = new LinkedList<>(); -- To stop receiving notification emails like this one, please contact [email protected].
