github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-03-23 07:40:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

buffer the reader instead of the stream

Browse Source 
seems to make more sense since the reader could be smarter about it?
This commit is contained in:
Havoc Pennington 2011-11-12 18:00:07 -05:00
parent 926a726ea3
commit 7a63eab4ab
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/typesafe/config/impl/Parser.java
View File

@ -1,6 +1,7 @@
package com.typesafe.config.impl;
import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@ -25,14 +26,20 @@ import com.typesafe.config.ConfigValueType;
final class Parser {
/**
* Parses an input stream, which must be in UTF-8 encoding and should be
* buffered. Does not close the stream; you have to arrange to do that
* yourself.
* Parses an input stream, which must be in UTF-8 encoding and should not be
* buffered because we'll use a BufferedReader instead. Does not close the
* stream; you have to arrange to do that yourself.
*/
static AbstractConfigValue parse(SyntaxFlavor flavor, ConfigOrigin origin,
InputStream input, IncludeHandler includer) {
try {
return parse(flavor, origin, new InputStreamReader(input, "UTF-8"),
// well, this is messed up. If we aren't going to close
// the passed-in InputStream then we have no way to
// close these readers. So maybe we should not have an
// InputStream version, only a Reader version.
Reader reader = new InputStreamReader(input, "UTF-8");
reader = new BufferedReader(reader);
return parse(flavor, origin, reader,
includer);
} catch (UnsupportedEncodingException e) {
throw new ConfigException.BugOrBroken(
@ -92,7 +99,6 @@ final class Parser {
try {
InputStream stream = url.openStream();
try {
stream = new BufferedInputStream(stream);
result = parse(
flavor != null ? flavor : flavorFromExtension(
url.getPath(), origin), origin, stream,