Skip to content

Commit dc554d7

Browse files
committed
Migrate to platform 2.7.3 and Java 21
1 parent df7c8e4 commit dc554d7

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

omod/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
*/
3030
package org.springframework.web.servlet.mvc;
3131

32+
import java.util.Enumeration;
3233
import java.util.HashMap;
3334
import java.util.Map;
3435

@@ -654,7 +655,20 @@ protected int getTargetPage(HttpServletRequest request, Object command, Errors e
654655
* @see #PARAM_TARGET
655656
*/
656657
protected int getTargetPage(HttpServletRequest request, int currentPage) {
657-
return WebUtils.getTargetPage(request, PARAM_TARGET, currentPage);
658+
Enumeration<String> parameterNames = request.getParameterNames();
659+
while (parameterNames.hasMoreElements()) {
660+
String param = parameterNames.nextElement();
661+
if (param.startsWith(PARAM_TARGET)) {
662+
String pageStr = param.substring(PARAM_TARGET.length());
663+
try {
664+
return Integer.parseInt(pageStr);
665+
}
666+
catch (NumberFormatException e) {
667+
logger.error(e);
668+
}
669+
}
670+
}
671+
return currentPage;
658672
}
659673

660674
/**

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
</modules>
5252

5353
<properties>
54-
<openmrsPlatformVersion>2.0.0</openmrsPlatformVersion>
54+
<openmrsPlatformVersion>2.7.3</openmrsPlatformVersion>
5555
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
56-
<javaCompilerVersion>1.8</javaCompilerVersion>
56+
<javaCompilerVersion>21</javaCompilerVersion>
5757
</properties>
5858

5959
<dependencyManagement>

0 commit comments

Comments
 (0)