Bug 696030 - Use MonitorAutoLock rather than MonitorAutoEnter in nsGIOProtocolHandler r=karlt

--HG--
extra : rebase_source : 6f3d1a49a07affab679e41cd8cf968d62c072299
This commit is contained in:
Chris Coulson 2012-01-05 11:19:50 +13:00
parent 0d9e8e8ecb
commit bafce9bfd5

View File

@ -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();