Merge remote-tracking branch 'origin/feat/retryHttp' into fix/replayR…

…esult # Conflicts: # arex-schedule-web-api/pom.xml # pom.xml
arextest · Sep 14, 2024 · 7d5fcd4 · 7d5fcd4
2 parents 9773bb2 + 392aef8
commit 7d5fcd4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/arex-schedule-web-api/pom.xml b/arex-schedule-web-api/pom.xml
@@ -136,7 +136,7 @@
   <parent>
     <artifactId>arex-schedule-parent</artifactId>
     <groupId>com.arextest</groupId>
-    <version>1.2.19</version>
+    <version>1.2.20</version>
   </parent>
 
   <profiles>
@@ -338,5 +338,5 @@
       </properties>
     </profile>
   </profiles>
-  <version>1.2.19</version>
+  <version>1.2.20</version>
 </project>
diff --git a/...i/src/main/java/com/arextest/schedule/comparer/impl/PrepareCompareSourceRemoteLoader.java b/...i/src/main/java/com/arextest/schedule/comparer/impl/PrepareCompareSourceRemoteLoader.java
@@ -119,7 +119,8 @@ private List<CategoryComparisonHolder> processMatchNeeded(QueryReplayResultRespo
     List<CategoryComparisonHolder> decodedListResult = new ArrayList<>(resultHolderList.size());
     for (ListResultHolder stringListResultHolder : resultHolderList) {
       MockCategoryType categoryType = stringListResultHolder.getCategoryType();
-      if (categoryType == null || categoryType.isSkipComparison()) {
+      if (categoryType == null || (categoryType.isSkipComparison() &&
+          MockCategoryType.Q_MESSAGE_CONSUMER != categoryType)) {
         continue;
       }
 

diff --git a/pom.xml b/pom.xml
@@ -320,5 +320,5 @@
     <url>https://github.com/arextest/arex-replay-schedule</url>
   </scm>
   <url>https://github.com/arextest/arex-replay-schedule</url>
-  <version>1.2.19</version>
+  <version>1.2.20</version>
 </project>