Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

YamlProcessor explicitly closes UnicodeReader

Browse Source 
Issue: SPR-13173
This commit is contained in:
Juergen Hoeller
2015-06-29 23:47:37 +02:00
parent 7c94c699df
commit 26acb4887d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 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,7 @@
package org.springframework.beans.factory.config; package org.springframework.beans.factory.config;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.Reader;
import java.util.AbstractMap; import java.util.AbstractMap;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@@ -35,6 +35,7 @@ import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor; import org.yaml.snakeyaml.constructor.Constructor;
import org.yaml.snakeyaml.nodes.MappingNode; import org.yaml.snakeyaml.nodes.MappingNode;
import org.yaml.snakeyaml.parser.ParserException; import org.yaml.snakeyaml.parser.ParserException;
import org.yaml.snakeyaml.reader.UnicodeReader;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.util.Assert; import org.springframework.util.Assert;
@@ -155,9 +156,9 @@ public abstract class YamlProcessor {
if (this.logger.isDebugEnabled()) { if (this.logger.isDebugEnabled()) {
this.logger.debug("Loading from YAML: " + resource); this.logger.debug("Loading from YAML: " + resource);
} }
InputStream stream = resource.getInputStream(); Reader reader = new UnicodeReader(resource.getInputStream());
try { try {
for (Object object : yaml.loadAll(stream)) { for (Object object : yaml.loadAll(reader)) {
if (object != null && process(asMap(object), callback)) { if (object != null && process(asMap(object), callback)) {
count++; count++;
if (this.resolutionMethod == ResolutionMethod.FIRST_FOUND) { if (this.resolutionMethod == ResolutionMethod.FIRST_FOUND) {
@@ -171,7 +172,7 @@ public abstract class YamlProcessor {
} }
} }
finally { finally {
stream.close(); reader.close();
} }
} }
catch (IOException ex) { catch (IOException ex) {