fix transaction list error (#599)

Co-authored-by: ylxiao5 <[email protected]>
WeBankBlockchain · Dec 15, 2023 · 85f128f · 85f128f
1 parent 6def3f7
commit 85f128f
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/main/java/com/webank/wecross/routine/xa/XATransactionManager.java b/src/main/java/com/webank/wecross/routine/xa/XATransactionManager.java
@@ -781,16 +781,11 @@ public void asyncListXATransactions(
 
  XATransactionListResponse response = new XATransactionListResponse();
 
- ListXAReduceCallback reduceCallback = null;
  List<Path> chainPaths = new ArrayList<>();
  if (Objects.isNull(chainPath) || chainPath.isEmpty()) {
  chainPaths = setToList(zoneManager.getAllChainsInfo(false).keySet());
- // has sort operation callback
- reduceCallback = getListXAReduceCallback(offsets.size(), offsets, size, callback);
  } else {
  chainPaths.add(Path.decode(chainPath));
- // Remove sort operation callback
- reduceCallback = getListXACallback(offsets.size(), offsets, size, callback);
  }
 
  int chainNum = chainPaths.size();
@@ -810,6 +805,15 @@ public void asyncListXATransactions(
  }
  }
 
+ ListXAReduceCallback reduceCallback = null;
+ if (Objects.isNull(chainPath) || chainPath.isEmpty()) {
+ // has sort operation callback
+ reduceCallback = getListXAReduceCallback(offsets.size(), offsets, size, callback);
+ } else {
+ // Remove sort operation callback
+ reduceCallback = getListXACallback(offsets.size(), offsets, size, callback);
+ }
+
  for (String chain : offsets.keySet()) {
  if (!requireIgnore || offsets.get(chain) != -1L) {
  asyncListXATransactions(