friendlynamazu/server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix disposed semaphores

Browse Source
This commit is contained in:
rootdarkarchon
2023-11-18 17:41:18 +01:00
parent a1573ad2c3
commit 5a4010cb8a
1 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/ServerFilesController.cs
View File

@@ -239,12 +239,22 @@ public class ServerFilesController : ControllerBase
return BadRequest(); return BadRequest();
} }
finally finally
{
try
{ {
fileLock?.Release(); fileLock?.Release();
fileLock?.Dispose(); fileLock?.Dispose();
}
catch (ObjectDisposedException)
{
// it's disposed whatever
}
finally
{
_fileUploadLocks.TryRemove(hash, out _); _fileUploadLocks.TryRemove(hash, out _);
} }
} }
}
[HttpPost(MareFiles.ServerFiles_UploadMunged + "/{hash}")] [HttpPost(MareFiles.ServerFiles_UploadMunged + "/{hash}")]
[RequestSizeLimit(200 * 1024 * 1024)] [RequestSizeLimit(200 * 1024 * 1024)]
@@ -326,12 +336,22 @@ public class ServerFilesController : ControllerBase
return BadRequest(); return BadRequest();
} }
finally finally
{
try
{ {
fileLock?.Release(); fileLock?.Release();
fileLock?.Dispose(); fileLock?.Dispose();
}
catch (ObjectDisposedException)
{
// it's disposed whatever
}
finally
{
_fileUploadLocks.TryRemove(hash, out _); _fileUploadLocks.TryRemove(hash, out _);
} }
} }
}
private static void MungeBuffer(Span<byte> buffer) private static void MungeBuffer(Span<byte> buffer)
{ {
@@ -421,10 +441,20 @@ public class ServerFilesController : ControllerBase
return BadRequest(); return BadRequest();
} }
finally finally
{
try
{ {
fileLock?.Release(); fileLock?.Release();
fileLock?.Dispose(); fileLock?.Dispose();
}
catch (ObjectDisposedException)
{
// it's disposed whatever
}
finally
{
_fileUploadLocks.TryRemove(hash, out _); _fileUploadLocks.TryRemove(hash, out _);
} }
} }
}
} }