lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/OrchardCMS/Orchard into dev

Browse Source
This commit is contained in:
Kees Damen
2015-05-08 19:49:53 +02:00
parent b4c578a2c5 9e66ee6560
commit e963fac2b9
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/Media/AzureBlobStorageProvider.cs
-4
View File
@@ -43,8 +43,6 @@ namespace Orchard.Azure.Services.FileSystems.Media {
// Create the file. The CreateFile() method will map the still relative path.
var file = CreateFile(path);
inputStream.Position = 0; // We need to read from the beginning of the stream, even if it isn't at it's beginning.
using (var outputStream = file.OpenWrite()) {
var buffer = new byte[8192];
while (true) {
@@ -54,8 +52,6 @@ namespace Orchard.Azure.Services.FileSystems.Media {
outputStream.Write(buffer, 0, length);
}
}
inputStream.Position = 0; // Rolling back the stream so external readers will have it easier.
}
/// <summary>
src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs
+4 -8
View File
@@ -312,10 +312,10 @@ namespace Orchard.FileSystems.Media {
/// <returns>True if success; False otherwise.</returns>
public bool TrySaveStream(string path, Stream inputStream) {
try {
if (FileExists(path)) {
return false;
}
if (FileExists(path)) {
return false;
}
SaveStream(path, inputStream);
}
catch {
@@ -336,8 +336,6 @@ namespace Orchard.FileSystems.Media {
// The CreateFile method will map the still relative path
var file = CreateFile(path);
inputStream.Position = 0; // We need to read from the beginning of the stream, even if it isn't at it's beginning.
using (var outputStream = file.OpenWrite()) {
var buffer = new byte[8192];
for (; ; ) {
@@ -348,8 +346,6 @@ namespace Orchard.FileSystems.Media {
outputStream.Write(buffer, 0, length);
}
}
inputStream.Position = 0; // Rolling back the stream so external readers will have it easier.
}
/// <summary>