Skip to content

Commit 3acf4bc

Browse files
authored
Merge pull request #24 from njfsilva/patch-1
Unnecessary buffers Patch
2 parents 70b29f2 + afd29ef commit 3acf4bc

File tree

2 files changed

+5
-23
lines changed

2 files changed

+5
-23
lines changed

jQuery-File-Upload.MVC3/Controllers/HomeController.cs

+3-12
Original file line numberDiff line numberDiff line change
@@ -91,24 +91,15 @@ private string EncodeFile(string fileName)
9191
private void UploadPartialFile(string fileName, HttpRequestBase request, List<ViewDataUploadFilesResult> statuses)
9292
{
9393
if (request.Files.Count != 1) throw new HttpRequestValidationException("Attempt to upload chunked file containing more than one fragment per request");
94-
var file = request.Files[0];
95-
var inputStream = file.InputStream;
9694

95+
var file = request.Files[0];
9796
var fullName = Path.Combine(StorageRoot, Path.GetFileName(fileName));
9897

9998
using (var fs = new FileStream(fullName, FileMode.Append, FileAccess.Write))
10099
{
101-
var buffer = new byte[1024];
102-
103-
var l = inputStream.Read(buffer, 0, 1024);
104-
while (l > 0)
105-
{
106-
fs.Write(buffer, 0, l);
107-
l = inputStream.Read(buffer, 0, 1024);
108-
}
109-
fs.Flush();
110-
fs.Close();
100+
file.InputStream.CopyTo(fs);
111101
}
102+
112103
statuses.Add(new ViewDataUploadFilesResult()
113104
{
114105
name = fileName,

jQuery-File-Upload.MVC3/Upload/UploadHandler.ashx.cs

+2-11
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,7 @@ private void UploadPartialFile(string fileName, HttpContext context, List<FilesS
108108

109109
using (var fs = new FileStream(fullName, FileMode.Append, FileAccess.Write))
110110
{
111-
var buffer = new byte[1024];
112-
113-
var l = inputStream.Read(buffer, 0, 1024);
114-
while (l > 0)
115-
{
116-
fs.Write(buffer, 0, l);
117-
l = inputStream.Read(buffer, 0, 1024);
118-
}
119-
fs.Flush();
120-
fs.Close();
111+
inputStream.CopyTo(fs);
121112
}
122113
statuses.Add(new FilesStatus(new FileInfo(fullName)));
123114
}
@@ -194,4 +185,4 @@ private void ListCurrentFiles(HttpContext context)
194185
}
195186

196187
}
197-
}
188+
}

0 commit comments

Comments
 (0)