Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added code to aggressively clean up file transport on failure.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@54262 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
warren%netscape.com 1999-11-23 07:01:56 +00:00
parent d6e9e1b9ad
commit 0257ba25ee
1 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mozilla/netwerk/protocol/file/src/nsFileChannel.cpp
View File

@ -223,12 +223,18 @@ nsFileChannel::OpenInputStream(PRUint32 startPosition, PRInt32 readCount,
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
rv = fts->CreateTransport(mSpec, mCommand, getter_AddRefs(mFileTransport)); rv = fts->CreateTransport(mSpec, mCommand, getter_AddRefs(mFileTransport));
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) goto done;
rv = mFileTransport->SetNotificationCallbacks(mCallbacks); rv = mFileTransport->SetNotificationCallbacks(mCallbacks);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) goto done;
return mFileTransport->OpenInputStream(startPosition, readCount, result); rv = mFileTransport->OpenInputStream(startPosition, readCount, result);
done:
if (NS_FAILED(rv)) {
// release the transport so that we don't think we're in progress
mFileTransport = nsnull;
}
return rv;
} }
NS_IMETHODIMP NS_IMETHODIMP
@ -243,12 +249,18 @@ nsFileChannel::OpenOutputStream(PRUint32 startPosition, nsIOutputStream **result
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
rv = fts->CreateTransport(mSpec, mCommand, getter_AddRefs(mFileTransport)); rv = fts->CreateTransport(mSpec, mCommand, getter_AddRefs(mFileTransport));
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) goto done;
rv = mFileTransport->SetNotificationCallbacks(mCallbacks); rv = mFileTransport->SetNotificationCallbacks(mCallbacks);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) goto done;
return mFileTransport->OpenOutputStream(startPosition, result); rv = mFileTransport->OpenOutputStream(startPosition, result);
done:
if (NS_FAILED(rv)) {
// release the transport so that we don't think we're in progress
mFileTransport = nsnull;
}
return rv;
} }
NS_IMETHODIMP NS_IMETHODIMP
@ -293,12 +305,18 @@ nsFileChannel::AsyncRead(PRUint32 startPosition, PRInt32 readCount,
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
rv = fts->CreateTransport(mSpec, mCommand, getter_AddRefs(mFileTransport)); rv = fts->CreateTransport(mSpec, mCommand, getter_AddRefs(mFileTransport));
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) goto done;
rv = mFileTransport->SetNotificationCallbacks(mCallbacks); rv = mFileTransport->SetNotificationCallbacks(mCallbacks);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) goto done;
return mFileTransport->AsyncRead(startPosition, readCount, ctxt, tempListener); rv = mFileTransport->AsyncRead(startPosition, readCount, ctxt, tempListener);
done:
if (NS_FAILED(rv)) {
// release the transport so that we don't think we're in progress
mFileTransport = nsnull;
}
return rv;
} }
NS_IMETHODIMP NS_IMETHODIMP
@ -316,12 +334,18 @@ nsFileChannel::AsyncWrite(nsIInputStream *fromStream,
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
rv = fts->CreateTransport(mSpec, mCommand, getter_AddRefs(mFileTransport)); rv = fts->CreateTransport(mSpec, mCommand, getter_AddRefs(mFileTransport));
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) goto done;
rv = mFileTransport->SetNotificationCallbacks(mCallbacks); rv = mFileTransport->SetNotificationCallbacks(mCallbacks);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) goto done;
return mFileTransport->AsyncWrite(fromStream, startPosition, writeCount, ctxt, observer); rv = mFileTransport->AsyncWrite(fromStream, startPosition, writeCount, ctxt, observer);
done:
if (NS_FAILED(rv)) {
// release the transport so that we don't think we're in progress
mFileTransport = nsnull;
}
return rv;
} }
NS_IMETHODIMP NS_IMETHODIMP