From f8347f925cbc263a997af246ad105813e7ff29ca Mon Sep 17 00:00:00 2001 From: Matt Bell Date: Tue, 13 Jan 2015 22:28:44 -0800 Subject: [PATCH] commands/files: Made ReaderFile take ReadClosers instead of trying to cast reader to Closer --- commands/files/readerfile.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/commands/files/readerfile.go b/commands/files/readerfile.go index bb9d338b6..af88562fd 100644 --- a/commands/files/readerfile.go +++ b/commands/files/readerfile.go @@ -6,7 +6,7 @@ import "io" // ReaderFiles are never directories, and can be read from and closed. type ReaderFile struct { Filename string - Reader io.Reader + Reader io.ReadCloser } func (f *ReaderFile) IsDirectory() bool { @@ -26,9 +26,5 @@ func (f *ReaderFile) Read(p []byte) (int, error) { } func (f *ReaderFile) Close() error { - closer, ok := f.Reader.(io.Closer) - if !ok { - return nil - } - return closer.Close() + return f.Reader.Close() }