Skip to content

Commit ede9d53

Browse files
jhoellerunknown
authored andcommitted
Updated resolvePath javadoc to reflect Environment-based placeholder resolution
Issue: SPR-9455
1 parent 4c823a3 commit ede9d53

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableConfigApplicationContext.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2012 the original author or authors.
2+
* Copyright 2002-2013 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
1717
package org.springframework.context.support;
1818

1919
import org.springframework.beans.factory.BeanNameAware;
20-
2120
import org.springframework.beans.factory.InitializingBean;
2221
import org.springframework.context.ApplicationContext;
2322
import org.springframework.util.Assert;
@@ -114,12 +113,13 @@ protected String[] getDefaultConfigLocations() {
114113

115114
/**
116115
* Resolve the given path, replacing placeholders with corresponding
117-
* system property values if necessary. Applied to config locations.
116+
* environment property values if necessary. Applied to config locations.
118117
* @param path the original file path
119118
* @return the resolved file path
119+
* @see org.springframework.core.env.Environment#resolveRequiredPlaceholders(String)
120120
*/
121121
protected String resolvePath(String path) {
122-
return this.getEnvironment().resolveRequiredPlaceholders(path);
122+
return getEnvironment().resolveRequiredPlaceholders(path);
123123
}
124124

125125

0 commit comments

Comments
 (0)