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

"file-encoding" attribute value is being applied correctly (SPR-8024)

This commit is contained in:
Juergen Hoeller 2011-12-22 03:14:02 +01:00 committed by Chris Beams
parent 4b138e0e50
commit e0252ad0b1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.context/src/main/java/org/springframework/context/config/AbstractPropertyLoadingBeanDefinitionParser.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2008 the original author or authors. * Copyright 2002-2011 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.
@ -53,7 +53,7 @@ abstract class AbstractPropertyLoadingBeanDefinitionParser extends AbstractSingl
String fileEncoding = element.getAttribute("file-encoding"); String fileEncoding = element.getAttribute("file-encoding");
if (StringUtils.hasLength(fileEncoding)) { if (StringUtils.hasLength(fileEncoding)) {
builder.addPropertyReference("fileEncoding", fileEncoding); builder.addPropertyValue("fileEncoding", fileEncoding);
} }
String order = element.getAttribute("order"); String order = element.getAttribute("order");

3
org.springframework.context/src/test/resources/org/springframework/context/config/contextNamespaceHandlerTests-location.xml
View File

@ -7,7 +7,8 @@
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd"> http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
<context:property-placeholder <context:property-placeholder
location="classpath*:/org/springframework/context/config/test-*.properties,classpath*:/org/springframework/context/config/empty-*.properties,classpath*:/org/springframework/context/config/missing-*.properties" /> location="classpath*:/org/springframework/context/config/test-*.properties,classpath*:/org/springframework/context/config/empty-*.properties,classpath*:/org/springframework/context/config/missing-*.properties"
file-encoding="ISO-8859-1"/>
<bean id="foo" class="java.lang.String"> <bean id="foo" class="java.lang.String">
<constructor-arg value="${foo}" /> <constructor-arg value="${foo}" />