Merge branch '1.2.x'

2015-06-23 09:46:12 -07:00
parent d0698bd8ed 16e7c99e4d
commit ab18fb29a3
1 changed files with 2 additions and 1 deletions
--- a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
@@ -460,7 +460,8 @@ public class ConfigFileApplicationListenerTests {

 	@Test
 	public void absoluteResourceDefaultsToFile() throws Exception {
-		String location = new File("src/test/resources/specificlocation.properties").getAbsolutePath();
+		String location = new File("src/test/resources/specificlocation.properties")
+				.getAbsolutePath();
 		EnvironmentTestUtils.addEnvironment(this.environment, "spring.config.location:"
 				+ location);
 		this.initializer.onApplicationEvent(this.event);