You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/05/08 16:40:14 UTC
[servicecomb-pack] branch master updated (9064e55 -> 29cc928)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git.
from 9064e55 SCB-1272 Improved SecurityException exception catch
new cf08121 SCB-1279 add OmegaContext attributes verification on Aspect
new 29cc928 SCB-1279 add more information about the OmegaContext verify
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/servicecomb/pack/omega/context/OmegaContext.java | 6 ++++++
.../servicecomb/pack/omega/transaction/TransactionAspect.java | 1 +
.../pack/omega/transaction/tcc/TccParticipatorAspect.java | 1 +
3 files changed, 8 insertions(+)
[servicecomb-pack] 02/02: SCB-1279 add more information about the
OmegaContext verify
Posted by ni...@apache.org.
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/servicecomb-pack.git
commit 29cc928ae2eb8bf5385902ed06fca7238adaa31c
Author: Lei Zhang <co...@gmail.com>
AuthorDate: Wed May 8 14:58:17 2019 +0800
SCB-1279 add more information about the OmegaContext verify
---
.../java/org/apache/servicecomb/pack/omega/context/OmegaContext.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/OmegaContext.java b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/OmegaContext.java
index bebb32b..0b8f3a5 100644
--- a/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/OmegaContext.java
+++ b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/OmegaContext.java
@@ -75,7 +75,7 @@ public class OmegaContext {
public void verify(){
if(this.globalTxId == null){
- throw new RuntimeException("OmegaContext globalTxId is empty");
+ throw new RuntimeException("OmegaContext globalTxId is empty, Please check if you setup the pack transport handler rightly");
}
}
}
[servicecomb-pack] 01/02: SCB-1279 add OmegaContext attributes
verification on Aspect
Posted by ni...@apache.org.
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/servicecomb-pack.git
commit cf08121b8e1d7a15855b2bc65f94f804677917d4
Author: Lei Zhang <co...@gmail.com>
AuthorDate: Wed May 8 10:53:34 2019 +0800
SCB-1279 add OmegaContext attributes verification on Aspect
---
.../org/apache/servicecomb/pack/omega/context/OmegaContext.java | 6 ++++++
.../servicecomb/pack/omega/transaction/TransactionAspect.java | 1 +
.../pack/omega/transaction/tcc/TccParticipatorAspect.java | 1 +
3 files changed, 8 insertions(+)
diff --git a/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/OmegaContext.java b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/OmegaContext.java
index 015aa67..bebb32b 100644
--- a/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/OmegaContext.java
+++ b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/OmegaContext.java
@@ -72,4 +72,10 @@ public class OmegaContext {
", localTxId=" + localTxId.get() +
'}';
}
+
+ public void verify(){
+ if(this.globalTxId == null){
+ throw new RuntimeException("OmegaContext globalTxId is empty");
+ }
+ }
}
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspect.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspect.java
index 262067f..5e57ee7 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspect.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspect.java
@@ -39,6 +39,7 @@ public class TransactionAspect {
public TransactionAspect(SagaMessageSender sender, OmegaContext context) {
this.context = context;
+ this.context.verify();
this.interceptor = new CompensableInterceptor(context, sender);
}
diff --git a/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccParticipatorAspect.java b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccParticipatorAspect.java
index 282d644..1da7ddf 100644
--- a/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccParticipatorAspect.java
+++ b/omega/omega-transaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/tcc/TccParticipatorAspect.java
@@ -44,6 +44,7 @@ public class TccParticipatorAspect {
public TccParticipatorAspect(TccMessageSender tccMessageSender, OmegaContext context,
ParametersContext parametersContext) {
this.context = context;
+ this.context.verify();
this.tccMessageSender = tccMessageSender;
this.parametersContext = parametersContext;
}