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

Polish "Allow bypass of active/default properties"

Browse Source 
See gh-26461
This commit is contained in:
Stephane Nicoll
2021-02-15 16:24:10 +01:00
parent da3ff29e88
commit 8807f94ad8
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2021 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.
@@ -247,8 +247,8 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
/**
* Return the property value for the active profiles.
* @see #ACTIVE_PROFILES_PROPERTY_NAME
* @since 5.3.4
* @see #ACTIVE_PROFILES_PROPERTY_NAME
*/
protected String doGetActiveProfilesProperty() {
return getProperty(ACTIVE_PROFILES_PROPERTY_NAME);
@@ -313,8 +313,8 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
/**
* Return the property value for the default profiles.
* @see #DEFAULT_PROFILES_PROPERTY_NAME
* @since 5.3.4
* @see #DEFAULT_PROFILES_PROPERTY_NAME
*/
protected String doGetDefaultProfilesProperty() {
return getProperty(DEFAULT_PROFILES_PROPERTY_NAME);