mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 23:31:56 +00:00
Bug 696030 - Use MonitorAutoLock rather than MonitorAutoEnter in nsGIOProtocolHandler r=karlt
--HG-- extra : rebase_source : 6f3d1a49a07affab679e41cd8cf968d62c072299
This commit is contained in:
parent
0d9e8e8ecb
commit
bafce9bfd5
@ -238,7 +238,7 @@ class nsGIOInputStream : public nsIInputStream
|
|||||||
void
|
void
|
||||||
nsGIOInputStream::SetMountResult(MountOperationResult result, gint error_code)
|
nsGIOInputStream::SetMountResult(MountOperationResult result, gint error_code)
|
||||||
{
|
{
|
||||||
mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);
|
mozilla::MonitorAutoLock mon(mMonitorMountInProgress);
|
||||||
mMountRes = result;
|
mMountRes = result;
|
||||||
mMountErrorCode = error_code;
|
mMountErrorCode = error_code;
|
||||||
mon.Notify();
|
mon.Notify();
|
||||||
@ -263,7 +263,7 @@ nsGIOInputStream::MountVolume() {
|
|||||||
NULL,
|
NULL,
|
||||||
mount_enclosing_volume_finished,
|
mount_enclosing_volume_finished,
|
||||||
this);
|
this);
|
||||||
mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);
|
mozilla::MonitorAutoLock mon(mMonitorMountInProgress);
|
||||||
/* Waiting for finish of mount operation thread */
|
/* Waiting for finish of mount operation thread */
|
||||||
while (mMountRes == MOUNT_OPERATION_IN_PROGRESS)
|
while (mMountRes == MOUNT_OPERATION_IN_PROGRESS)
|
||||||
mon.Wait();
|
mon.Wait();
|
||||||
|
Loading…
Reference in New Issue
Block a user