Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2025-04-30 17:56:36 +02:00
parent b98ef1309b 4466548f53
commit d0a1ba5092
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/main/java/org/springframework/web/context/ConfigurableWebEnvironment.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ public interface ConfigurableWebEnvironment extends ConfigurableEnvironment {
* org.springframework.core.env.PropertySource.StubPropertySource stub property source}
* instances acting as placeholders with real servlet context/config property sources
* using the given parameters.
* @param servletContext the {@link ServletContext} (may not be {@code null})
* @param servletContext the {@link ServletContext} ({@code null} if not available)
* @param servletConfig the {@link ServletConfig} ({@code null} if not available)
* @see org.springframework.web.context.support.WebApplicationContextUtils#initServletPropertySources(
* org.springframework.core.env.MutablePropertySources, ServletContext, ServletConfig)