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

check for non-null connection in mozStorageTransaction helper. b=384224, r=sspitzer

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@228032 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dwitte%stanford.edu
2007-06-14 04:58:52 +00:00
parent 729e7fc296
commit 8204b2758c
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/storage/public/mozStorageHelper.h
View File

@@ -64,18 +64,21 @@ public:
PRBool aCommitOnComplete,
PRInt32 aType = mozIStorageConnection::TRANSACTION_DEFERRED)
: mConnection(aConnection),
mHasTransaction(PR_FALSE),
mCommitOnComplete(aCommitOnComplete),
mCompleted(PR_FALSE)
{
PRBool transactionInProgress = PR_FALSE;
mConnection->GetTransactionInProgress(&transactionInProgress);
mHasTransaction = ! transactionInProgress;
if (mHasTransaction)
mConnection->BeginTransactionAs(aType);
if (mConnection) {
PRBool transactionInProgress = PR_FALSE;
mConnection->GetTransactionInProgress(&transactionInProgress);
mHasTransaction = ! transactionInProgress;
if (mHasTransaction)
mConnection->BeginTransactionAs(aType);
}
}
~mozStorageTransaction()
{
if (mHasTransaction && ! mCompleted) {
if (mConnection && mHasTransaction && ! mCompleted) {
if (mCommitOnComplete)
mConnection->CommitTransaction();
else
@@ -90,8 +93,8 @@ public:
*/
nsresult Commit()
{
if (mCompleted)
return NS_OK; // already done
if (!mConnection || mCompleted)
return NS_OK; // no connection, or already done
mCompleted = PR_TRUE;
if (! mHasTransaction)
return NS_OK; // transaction not ours, ignore
@@ -105,8 +108,8 @@ public:
*/
nsresult Rollback()
{
if (mCompleted)
return NS_OK; // already done
if (!mConnection || mCompleted)
return NS_OK; // no connection, or already done
mCompleted = PR_TRUE;
if (! mHasTransaction)
return NS_ERROR_FAILURE;