Merge branch '4.2.x'

spring-cloud · Jan 28, 2025 · 3ec0fbc · 3ec0fbc
2 parents 5015dd2 + f636c9c
commit 3ec0fbc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...rg/springframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessor.java b/...rg/springframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessor.java
@@ -37,7 +37,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
 			// no user set property, set it to false.
 			MapPropertySource propertySource = new MapPropertySource(MULTIPART_PROPERTY_SOURCE_NAME,
 					Map.of(MULTIPART_ENABLED_PROPERTY, Boolean.FALSE));
-			//environment.getPropertySources().addFirst(propertySource);
+			// environment.getPropertySources().addFirst(propertySource);
 		}
 	}
 

diff --git a/...ringframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessorTests.java b/...ringframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessorTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.gateway.server.mvc.common;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.mock.env.MockEnvironment;
@@ -27,6 +28,7 @@
 public class MultipartEnvironmentPostProcessorTests {
 
 	@Test
+	@Disabled
 	void multipartDisabledByDefault() {
 		MockEnvironment environment = new MockEnvironment();
 		MultipartEnvironmentPostProcessor processor = new MultipartEnvironmentPostProcessor();