Fixed json batch requests without atomicityGroup running in the same …

…group
FraunhoferIOSB · Nov 11, 2024 · 4a6341b · 4a6341b
1 parent 714b036
commit 4a6341b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ FROST-Server version 2.5 and higher requires Java 21. This is because some libra
 * Apply fine-grained authorisation to MQTT-Create.
 * Fixed the resolving of references in the URL of json batch requests.
 * Fixed differences in HTTP response code between GET and HEAD requests.
+* Fixed json batch requests without atomicity group all running in the same group.
 
 
 ## Release version 2.4.0

diff --git a/...va/de/fraunhofer/iosb/ilt/frostserver/plugin/batchprocessing/json/JsonBatchProcessor.java b/...va/de/fraunhofer/iosb/ilt/frostserver/plugin/batchprocessing/json/JsonBatchProcessor.java
@@ -149,7 +149,7 @@ public void processNextRequest() {
             if (parser.nextToken() == JsonToken.START_OBJECT) {
                 JsonBatchRequestItem item = parser.readValueAs(JsonBatchRequestItem.class);
                 final String itemGroup = item.getAtomicityGroup();
-                if (!StringUtils.equals(currentGroup, itemGroup)) {
+                if (itemGroup == null || !StringUtils.equals(currentGroup, itemGroup)) {
                     service.commitTransaction();
                     service.startTransaction(request.getUserPrincipal());
                     currentGroup = itemGroup;