зеркало из https://github.com/mozilla/gecko-dev.git
fixing crasher introduced when new Setter*() were dropped in last night. we now set the channel's url member *before* calling the set routines.
This commit is contained in:
Родитель
cdd368478b
Коммит
aaa223115e
|
@ -104,6 +104,13 @@ nsFTPChannel::Init(const char* verb,
|
||||||
|
|
||||||
mHandler = aHandler;
|
mHandler = aHandler;
|
||||||
|
|
||||||
|
NS_ASSERTION(aPool, "FTP channel needs a thread pool to play in");
|
||||||
|
if (!aPool) return NS_ERROR_NULL_POINTER;
|
||||||
|
mPool = aPool;
|
||||||
|
|
||||||
|
mOriginalURI = originalURI ? originalURI : uri;
|
||||||
|
mURL = uri;
|
||||||
|
|
||||||
rv = SetLoadAttributes(loadAttributes);
|
rv = SetLoadAttributes(loadAttributes);
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
|
@ -113,13 +120,6 @@ nsFTPChannel::Init(const char* verb,
|
||||||
rv = SetNotificationCallbacks(notificationCallbacks);
|
rv = SetNotificationCallbacks(notificationCallbacks);
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
NS_ASSERTION(aPool, "FTP channel needs a thread pool to play in");
|
|
||||||
if (!aPool) return NS_ERROR_NULL_POINTER;
|
|
||||||
mPool = aPool;
|
|
||||||
|
|
||||||
mOriginalURI = originalURI ? originalURI : uri;
|
|
||||||
mURL = uri;
|
|
||||||
|
|
||||||
NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv);
|
NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueService, &rv);
|
||||||
if (NS_FAILED(rv)) return rv;
|
if (NS_FAILED(rv)) return rv;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче