Commit c12bb77c authored by Andy Wilkinson's avatar Andy Wilkinson

Merge pull request #15885 from Christoph Dreis

* gh-15885:
  Clean up SpringPropertyAction.getValue()

Closes gh-15885
parents 648cbaac 3fb87a45
/*
* 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 @@ class SpringPropertyAction extends Action {
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment