Merge pull request spring-projects#15885 from Christoph Dreis

wilkinsona · wilkinsona · commit c12bb77cb514 · 2019-02-11T16:59:11.000Z
* spring-projectsgh-15885: Clean up SpringPropertyAction.getValue() Closes spring-projectsgh-15885
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringPropertyAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 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.
@@ -65,17 +65,7 @@ private String getValue(String source, String defaultValue) {
 			addWarn("No Spring Environment available to resolve " + source);
 			return defaultValue;
 		}
-		String value = this.environment.getProperty(source);
-		if (value != null) {
-			return value;
-		}
-		int lastDot = source.lastIndexOf('.');
-		if (lastDot > 0) {
-			String prefix = source.substring(0, lastDot + 1);
-			return this.environment.getProperty(prefix + source.substring(lastDot + 1),
-					defaultValue);
-		}
-		return defaultValue;
+		return this.environment.getProperty(source, defaultValue);
 	}
 
 	@Override
