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/07/22 11:20:25 UTC
[servicecomb-pack] 05/05: SCB-1385 Fixed the typo with thanks to
Daniel Qian
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 fa608a2b660f21bde6870d6dc80a6f2ccc75ef89
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Mon Jul 22 10:38:29 2019 +0800
SCB-1385 Fixed the typo with thanks to Daniel Qian
---
.../servicecomb/pack/omega/context/TransactionContextProperties.java | 2 +-
.../apache/servicecomb/pack/omega/transaction/TransactionAspect.java | 2 +-
.../servicecomb/pack/omega/transaction/TransactionAspectTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/TransactionContextProperties.java b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/TransactionContextProperties.java
index 2266c68..5cdda09 100644
--- a/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/TransactionContextProperties.java
+++ b/omega/omega-context/src/main/java/org/apache/servicecomb/pack/omega/context/TransactionContextProperties.java
@@ -21,7 +21,7 @@ package org.apache.servicecomb.pack.omega.context;
* and LocalTransactionId out of the business class, and set up the OmegaContext before calling sub transaction method.
*/
public interface TransactionContextProperties {
- String getGloableTxId();
+ String getGlobalTxId();
String getLocalTxId();
}
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 81cc343..26e2993 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
@@ -85,7 +85,7 @@ public class TransactionAspect {
}
if (arg instanceof TransactionContextProperties) {
TransactionContextProperties transactionContextProperties = (TransactionContextProperties) arg;
- return new TransactionContext(transactionContextProperties.getGloableTxId(), transactionContextProperties.getLocalTxId());
+ return new TransactionContext(transactionContextProperties.getGlobalTxId(), transactionContextProperties.getLocalTxId());
}
}
}
diff --git a/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspectTest.java b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspectTest.java
index 491d182..fa23fea 100644
--- a/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspectTest.java
+++ b/omega/omega-transaction/src/test/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspectTest.java
@@ -110,7 +110,7 @@ public class TransactionAspectTest {
omegaContext.setGlobalTxId(globalTxId);
omegaContext.setLocalTxId(localTxId);
- when(transactionContextProperties.getGloableTxId()).thenReturn(transactionGloablTxId);
+ when(transactionContextProperties.getGlobalTxId()).thenReturn(transactionGloablTxId);
when(transactionContextProperties.getLocalTxId()).thenReturn(transactionLocalTxId);
when(tx.globalTxId()).thenReturn(transactionGloablTxId);
when(tx.localTxId()).thenReturn(transactionLocalTxId);