Merge branch 'master' into fix-2768

apolloconfig · Nov 25, 2019 · b4aac3f · b4aac3f
2 parents a74a005 + 5daa088
commit b4aac3f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/...main/java/com/ctrip/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java b/...main/java/com/ctrip/framework/apollo/spring/boot/ApolloApplicationContextInitializer.java
@@ -72,8 +72,7 @@ public class ApolloApplicationContextInitializer implements
   public void initialize(ConfigurableApplicationContext context) {
     ConfigurableEnvironment environment = context.getEnvironment();
 
-    String enabled = environment.getProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "false");
-    if (!Boolean.valueOf(enabled)) {
+    if (!environment.getProperty(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, Boolean.class, false)) {
       logger.debug("Apollo bootstrap config is not enabled for context {}, see property: ${{}}", context, PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED);
       return;
     }