Merge branch 'master' into docker-push-changes

protegeproject · Aug 6, 2024 · 9fa6157 · 9fa6157
2 parents 62e7625 + 1c49e28
commit 9fa6157
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>edu.stanford.protege</groupId>
     <artifactId>webprotege-gwt-ui</artifactId>
-    <version>6.0.1</version>
+    <version>6.0.4</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/webprotege-gwt-ui-client/pom.xml b/webprotege-gwt-ui-client/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>edu.stanford.protege</groupId>
         <artifactId>webprotege-gwt-ui</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.4</version>
     </parent>
 
     <artifactId>webprotege-gwt-ui-client</artifactId>

diff --git a/webprotege-gwt-ui-server-core/pom.xml b/webprotege-gwt-ui-server-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>webprotege-gwt-ui</artifactId>
         <groupId>edu.stanford.protege</groupId>
-        <version>6.0.1</version>
+        <version>6.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/webprotege-gwt-ui-server/pom.xml b/webprotege-gwt-ui-server/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>edu.stanford.protege</groupId>
         <artifactId>webprotege-gwt-ui</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.4</version>
     </parent>
 
     <artifactId>webprotege-gwt-ui-server</artifactId>

diff --git a/...i-server/src/main/java/edu/stanford/bmir/protege/web/server/dispatch/DispatchServlet.java b/...i-server/src/main/java/edu/stanford/bmir/protege/web/server/dispatch/DispatchServlet.java
@@ -105,9 +105,9 @@ private CompletableFuture<Void> createCompletableFutureForBatchAction(ImmutableL
                     var innerExecutionResult = ActionExecutionResult.get(innerResult);
                     resultList.set(index, innerExecutionResult);
                 } catch (ActionExecutionException e) {
-                    resultList.add(ActionExecutionResult.get(e));
+                    resultList.set(index, ActionExecutionResult.get(e));
                 } catch (PermissionDeniedException e) {
-                    resultList.add(ActionExecutionResult.get(e));
+                    resultList.set(index, ActionExecutionResult.get(e));
                 }
             });
             futures.add(future);

diff --git a/webprotege-gwt-ui-shared-core/pom.xml b/webprotege-gwt-ui-shared-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>webprotege-gwt-ui</artifactId>
         <groupId>edu.stanford.protege</groupId>
-        <version>6.0.1</version>
+        <version>6.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/webprotege-gwt-ui-shared/pom.xml b/webprotege-gwt-ui-shared/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>edu.stanford.protege</groupId>
         <artifactId>webprotege-gwt-ui</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.4</version>
     </parent>
 
     <artifactId>webprotege-gwt-ui-shared</artifactId>