Merge fix-stackoverflow

ftsrg · Jul 30, 2023 · 119b79f · 119b79f
2 parents 10f89a4 + b14041a
commit 119b79f
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/...ntract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/TPCC.java b/...ntract/hyperledger-fabric/v2/java/src/main/java/hu/bme/mit/ftsrg/chaincode/tpcc/TPCC.java
@@ -1199,13 +1199,15 @@ private DeliveredOrder getOldestNewOrderForDistrict(
     final List<NewOrder> matchingNewOrders =
         registry
             .select(ctx, new NewOrder())
+            /* TODO this code causes a StackOverflowError for some reason
             .matching(
                 new Registry.Matcher<NewOrder>() {
                   @Override
                   public boolean match(NewOrder entity) {
                     return entity.getNo_w_id() == w_id && entity.getNo_d_id() == d_id;
                   }
                 })
+            */
             .sortedBy(
                 new Comparator<NewOrder>() {
                   @Override
@@ -1214,6 +1216,14 @@ public int compare(final NewOrder a, final NewOrder b) {
                   }
                 })
             .get();
+    /* Manually remove non-matching NewOrders, see above... */
+    final Iterator<NewOrder> it = matchingNewOrders.iterator();
+    while (it.hasNext()) {
+      final NewOrder no = it.next();
+      if (no.getNo_w_id() != w_id || no.getNo_d_id() != d_id) it.remove();
+    }
+    logger.debug("matchingNewOrders={}", matchingNewOrders);
+
     /*
      * [TPC-C 2.7.4.2 (3) (continued)]
      * ... If no matching row is found, then the delivery of an order