Skip to content

Commit e673345

Browse files
committed
Merge branch '6.2.x'
2 parents 6c46519 + 0abfad8 commit e673345

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

spring-core/src/main/java/org/springframework/core/SpringProperties.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,20 @@
2626
/**
2727
* Static holder for local Spring properties, i.e. defined at the Spring library level.
2828
*
29-
* <p>Reads a {@code spring.properties} file from the root of the Spring library classpath,
30-
* and also allows for programmatically setting properties through {@link #setProperty}.
31-
* When checking a property, local entries are being checked first, then falling back
32-
* to JVM-level system properties through a {@link System#getProperty} check.
29+
* <p>Reads a {@code spring.properties} file from the root of the classpath and
30+
* also allows for programmatically setting properties via {@link #setProperty}.
31+
* When retrieving properties, local entries are checked first, with JVM-level
32+
* system properties checked next as a fallback via {@link System#getProperty}.
3333
*
3434
* <p>This is an alternative way to set Spring-related system properties such as
35-
* "spring.getenv.ignore" and "spring.beaninfo.ignore", in particular for scenarios
36-
* where JVM system properties are locked on the target platform (for example, WebSphere).
37-
* See {@link #setFlag} for a convenient way to locally set such flags to "true".
35+
* {@code spring.getenv.ignore} and {@code spring.beaninfo.ignore}, in particular
36+
* for scenarios where JVM system properties are locked on the target platform
37+
* (for example, WebSphere). See {@link #setFlag} for a convenient way to locally
38+
* set such flags to {@code "true"}.
3839
*
3940
* @author Juergen Hoeller
4041
* @since 3.2.7
42+
* @see org.springframework.aot.AotDetector#AOT_ENABLED
4143
* @see org.springframework.beans.StandardBeanInfoFactory#IGNORE_BEANINFO_PROPERTY_NAME
4244
* @see org.springframework.beans.factory.support.DefaultListableBeanFactory#STRICT_LOCKING_PROPERTY_NAME
4345
* @see org.springframework.core.env.AbstractEnvironment#IGNORE_GETENV_PROPERTY_NAME

0 commit comments

Comments
 (0)