From 9f241a9e82c8df7da419ef0edbab34a29adc5534 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 26 Dec 2013 14:32:58 +0000 Subject: [PATCH] Ensure app index is used when profiles actrive --- .../initializer/ContextIdApplicationContextInitializer.java | 6 +++--- .../ContextIdApplicationContextInitializerTests.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializer.java index dcdda3fd82..89dfe7942d 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializer.java @@ -91,15 +91,15 @@ public class ContextIdApplicationContextInitializer implements private String getApplicationId(ConfigurableEnvironment environment) { String name = environment.resolvePlaceholders(this.name); String index = environment.resolvePlaceholders(INDEX_PATTERN); - if (!"null".equals(index)) { - return name + ":" + index; - } String profiles = StringUtils.arrayToCommaDelimitedString(environment .getActiveProfiles()); if (StringUtils.hasText(profiles)) { name = name + ":" + profiles; } + if (!"null".equals(index)) { + name = name + ":" + index; + } return name; } diff --git a/spring-boot/src/test/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializerTests.java index daf1e3ceba..eefee154dc 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/initializer/ContextIdApplicationContextInitializerTests.java @@ -51,9 +51,9 @@ public class ContextIdApplicationContextInitializerTests { public void testNameAndProfiles() { ConfigurableApplicationContext context = new AnnotationConfigApplicationContext(); TestUtils.addEnviroment(context, "spring.application.name:foo", - "spring.profiles.active: spam,bar"); + "spring.profiles.active: spam,bar", "spring.application.index:12"); this.initializer.initialize(context); - assertEquals("foo:spam,bar", context.getId()); + assertEquals("foo:spam,bar:12", context.getId()); } @Test