UrlPathHelper.removeJsessionid correctly appends remainder

Closes gh-26079

Author: rstoyanchev

spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java

@@ -543,7 +543,7 @@ private String removeJsessionid(String requestUri) {
 			return requestUri;
 		}
 		String start = requestUri.substring(0, index);
-		for (int i = key.length(); i < requestUri.length(); i++) {
+		for (int i = index + key.length(); i < requestUri.length(); i++) {
 			char c = requestUri.charAt(i);
 			if (c == ';' || c == '/') {
 				return start + requestUri.substring(i);

spring-web/src/test/java/org/springframework/web/util/UrlPathHelperTests.java

@@ -129,11 +129,19 @@ public void getRequestRemoveSemicolonContent() throws UnsupportedEncodingExcepti
 	public void getRequestKeepSemicolonContent() {
 		helper.setRemoveSemicolonContent(false);
 
-		request.setRequestURI("/foo;a=b;c=d");
-		assertEquals("/foo;a=b;c=d", helper.getRequestUri(request));
-
-		request.setRequestURI("/foo;jsessionid=c0o7fszeb1");
-		assertEquals("/foo", helper.getRequestUri(request));
+		testKeepSemicolonContent("/foo;a=b;c=d", "/foo;a=b;c=d");
+		testKeepSemicolonContent("/test;jsessionid=1234", "/test");
+		testKeepSemicolonContent("/test;JSESSIONID=1234", "/test");
+		testKeepSemicolonContent("/test;jsessionid=1234;a=b", "/test;a=b");
+		testKeepSemicolonContent("/test;a=b;jsessionid=1234;c=d", "/test;a=b;c=d");
+		testKeepSemicolonContent("/test;jsessionid=1234/anotherTest", "/test/anotherTest");
+		testKeepSemicolonContent("/test;jsessionid=;a=b", "/test;a=b");
+		testKeepSemicolonContent("/somethingLongerThan12;jsessionid=1234", "/somethingLongerThan12");
+	}
+
+	private void testKeepSemicolonContent(String requestUri, String expectedPath) {
+		request.setRequestURI(requestUri);
+		assertEquals(expectedPath, helper.getRequestUri(request));
 	}
 
 	@Test