fix encoding option on ReadStream, updated test

nodejs · Oct 1, 2010 · b5dc54c · b5dc54c
1 parent 2fb393a
commit b5dc54c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/fs.js b/lib/fs.js
@@ -623,6 +623,8 @@ var ReadStream = fs.ReadStream = function(path, options) {
     this[key] = options[key];
   }
 
+  if(this.encoding) this.setEncoding(this.encoding);
+
   if (this.start !== undefined || this.end !== undefined) {
     if (this.start === undefined || this.end === undefined) {
       this.emit('error',

diff --git a/test/simple/test-fs-read-stream.js b/test/simple/test-fs-read-stream.js
@@ -60,9 +60,8 @@ file2.destroy(function(err) {
   callbacks.destroy++;
 });
 
-var file3 = fs.createReadStream(fn);
+var file3 = fs.createReadStream(fn, {encoding: 'utf8'});
 file3.length = 0;
-file3.setEncoding('utf8');
 file3.addListener('data', function(data) {
   assert.equal("string", typeof(data));
   file3.length += data.length;