You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2016/06/09 04:20:47 UTC
metamodel git commit: METAMODEL-1086: Fixed
Repository: metamodel
Updated Branches:
refs/heads/master dbc9b54e5 -> f1fc2bf4d
METAMODEL-1086: Fixed
Fixes #104
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/f1fc2bf4
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/f1fc2bf4
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/f1fc2bf4
Branch: refs/heads/master
Commit: f1fc2bf4da40775ffa11416c665460d59b0180fb
Parents: dbc9b54
Author: Kasper S�rensen <i....@gmail.com>
Authored: Wed Jun 8 21:20:40 2016 -0700
Committer: Kasper S�rensen <i....@gmail.com>
Committed: Wed Jun 8 21:20:40 2016 -0700
----------------------------------------------------------------------
CHANGES.md | 4 ++--
csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/f1fc2bf4/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index 52f1323..92e13e4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,7 +1,7 @@
### Apache MetaModel 4.5.4 (work in progress)
- * [METAMODEL-1088] - Add support for aliases in MongoDB
-
+ * [METAMODEL-1088] - Add support for aliases in MongoDB.
+ * [METAMODEL-1086] - Fixed encoding issue when CsvDataContext is instantiated with InputStream.
### Apache MetaModel 4.5.3
http://git-wip-us.apache.org/repos/asf/metamodel/blob/f1fc2bf4/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
----------------------------------------------------------------------
diff --git a/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java b/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
index 3787453..ee456f0 100644
--- a/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
+++ b/csv/src/main/java/org/apache/metamodel/csv/CsvDataContext.java
@@ -244,7 +244,7 @@ public final class CsvDataContext extends QueryPostprocessDataContext implements
file = fileCandidate;
final BufferedWriter writer = FileHelper.getBufferedWriter(file, encoding);
- final BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+ final BufferedReader reader = FileHelper.getBufferedReader(inputStream, encoding);
try {
file.createNewFile();