Merge branch '4.1.x' into 4.2.x

spencergibb · spencergibb · commit 8140e0acc927 · 2025-01-27T16:16:32.000-05:00
diff --git a/spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessor.java b/spring-cloud-gateway-server-mvc/src/main/java/org/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);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp`
`37`	`37`	`// no user set property, set it to false.`
`38`	`38`	`MapPropertySource propertySource = new MapPropertySource(MULTIPART_PROPERTY_SOURCE_NAME,`
`39`	`39`	`Map.of(MULTIPART_ENABLED_PROPERTY, Boolean.FALSE));`
`40`		`- environment.getPropertySources().addFirst(propertySource);`
	`40`	`+ //environment.getPropertySources().addFirst(propertySource);`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`