Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Mar 29, 2022 · ab1db56 · ab1db56
2 parents 03c03da + 5792e46
commit ab1db56
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/dist/src/main/bin/midpoint.bat b/dist/src/main/bin/midpoint.bat
@@ -2,6 +2,10 @@
 
 setlocal
 
+if "%MIDPOINT_PORT%" == "" (
+    set MIDPOINT_PORT=8080
+)
+
 if "%1" == "start" goto doStart
 if "%1" == "stop" goto doStop
 
@@ -44,6 +48,10 @@ call "%MIDPOINT_HOME%\setenv.bat"
 
 :noSetEnvMpHome
 
+if "%MIDPOINT_PORT%" NEQ "8080" (
+    set JAVA_OPTS=%JAVA_OPTS% -Dserver.port=%MIDPOINT_PORT%
+)
+
 echo Using MIDPOINT_HOME:   "%MIDPOINT_HOME%"
 
 if not exist "%LIB_DIR%\midpoint.war" (
@@ -76,7 +84,21 @@ goto end
 
 :doStop
 
-set MIDPOINT_PORT=8080
+if not exist "%BIN_DIR%setenv.bat" goto :noSetEnvStop
+echo Applying %BIN_DIR%setenv.bat
+echo.
+
+call "%BIN_DIR%setenv.bat"
+
+:noSetEnvStop
+
+if not exist "%MIDPOINT_HOME%\setenv.bat" goto :noSetEnvMpHomeStop
+echo Applying %MIDPOINT_HOME%\setenv.bat
+echo.
+
+call "%MIDPOINT_HOME%\setenv.bat"
+
+:noSetEnvMpHomeStop
 
 echo Trying to find and stop a process listening on port %MIDPOINT_PORT%...
 set MIDPOINT_FOUND=

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItem.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItem.java
@@ -9,6 +9,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.evolveum.midpoint.schema.util.cases.CaseTypeUtil;
 import com.evolveum.midpoint.schema.util.cases.WorkItemTypeUtil;
 
 import org.apache.commons.lang3.StringUtils;
@@ -65,7 +66,7 @@ public class PageCaseWorkItem extends PageAdminCaseWorkItems {
     private static final String ID_BACK_BUTTON = "backButton";
 
     private final LoadableModel<CaseWorkItemType> caseWorkItemModel;
-    private final PageParameters pageParameters;
+    private PageParameters pageParameters;
 
     private LoadableModel<CaseType> caseModel;
     private WorkItemId workItemId;
@@ -253,4 +254,14 @@ protected PrismObject<UserType> getPowerDonor() {
         }
         return null;
     }
+
+    public PageParameters getPageParameters() {
+        if (pageParameters == null || StringUtils.isEmpty(pageParameters.get(OnePageParameterEncoder.PARAMETER).toString())) {
+            pageParameters = new PageParameters();
+            CaseWorkItemType workItem = caseWorkItemModel.getObject();
+            CaseType parentCase = CaseTypeUtil.getCase(workItem);
+            pageParameters.add(OnePageParameterEncoder.PARAMETER, WorkItemId.createWorkItemId(parentCase.getOid(), workItem.getId()));
+        }
+        return pageParameters;
+    }
 }
diff --git a/repo/repo-cache/src/test/java/com/evolveum/midpoint/repo/cache/TestRepositoryCache.java b/repo/repo-cache/src/test/java/com/evolveum/midpoint/repo/cache/TestRepositoryCache.java
@@ -313,9 +313,9 @@ public void test900HeapUsage() throws Exception {
         int count = 400;
 
         // 50 is the default "step" in paged iterative search, so we can expect we always have 50 objects in memory
-        // And "times 3" is the safety margin. It might or might not be sufficient, as System.gc() is not guaranteed to
+        // And "times 4" is the safety margin. It might or might not be sufficient, as System.gc() is not guaranteed to
         // really execute the garbage collection (only suggests JVM to do it).
-        long tolerance = (50 * size) * 3;
+        long tolerance = (50 * size) * 4;
 
         showMemory("Initial");
         dumpHeap("initial");

diff --git a/repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/RepoConcurrencyTest.java b/repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/RepoConcurrencyTest.java
@@ -842,6 +842,7 @@ public void test150WorkBucketsReplace() throws Exception {
 
         TaskType task = new TaskType()
                 .name("test150")
+                .taskIdentifier("test150")
                 .beginActivityState()
                 .beginActivity()
                 .beginBucketing()