Browse Source

Fix bad merge

4.0.x
Ryan Baxter 11 months ago
parent
commit
1dbe6c0c39
  1. 5
      spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java

5
spring-cloud-context/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java

@ -38,7 +38,6 @@ import org.springframework.boot.logging.LogFile; @@ -38,7 +38,6 @@ import org.springframework.boot.logging.LogFile;
import org.springframework.boot.logging.LoggingInitializationContext;
import org.springframework.boot.logging.LoggingSystem;
import org.springframework.cloud.bootstrap.BootstrapApplicationListener;
import org.springframework.cloud.bootstrap.BootstrapConfigFileApplicationListener;
import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
import org.springframework.cloud.logging.LoggingRebinder;
import org.springframework.context.ApplicationContextInitializer;
@ -302,9 +301,7 @@ public class PropertySourceBootstrapConfiguration implements ApplicationListener @@ -302,9 +301,7 @@ public class PropertySourceBootstrapConfiguration implements ApplicationListener
}
}
else {
Collections.addAll(profiles, getProfilesForValue(
propertySource.getProperty(BootstrapConfigFileApplicationListener.INCLUDE_PROFILES_PROPERTY),
environment));
Collections.addAll(profiles, getProfilesForValue(propertySource.getProperty(property), environment));
}
return profiles;
}

Loading…
Cancel
Save