root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Updated resolvePath javadoc to reflect Environment-based placeholder resolution 

Issue: SPR-9455
This commit is contained in:
Juergen Hoeller 2013-01-23 16:09:37 +01:00 committed by unknown
parent 4c823a3f9b
commit ede9d535ea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -17,7 +17,6 @@
package org.springframework.context.support; package org.springframework.context.support;
import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.util.Assert; import org.springframework.util.Assert;
@ -114,12 +113,13 @@ public abstract class AbstractRefreshableConfigApplicationContext extends Abstra
/** /**
* Resolve the given path, replacing placeholders with corresponding * Resolve the given path, replacing placeholders with corresponding
* system property values if necessary. Applied to config locations. * environment property values if necessary. Applied to config locations.
* @param path the original file path * @param path the original file path
* @return the resolved file path * @return the resolved file path
* @see org.springframework.core.env.Environment#resolveRequiredPlaceholders(String)
*/ */
protected String resolvePath(String path) { protected String resolvePath(String path) {
return this.getEnvironment().resolveRequiredPlaceholders(path); return getEnvironment().resolveRequiredPlaceholders(path);
} }