Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372223 )
Change subject: database: make close() sanity check mTrxPreCommitCallbacks
......................................................................
database: make close() sanity check mTrxPreCommitCallbacks
The other callback types are already checked too.
Change-Id: Ibdc82110c0a0e74bb07ed92ee667bdf0d9f69f90
---
M includes/libs/rdbms/database/Database.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/23/372223/1
diff --git a/includes/libs/rdbms/database/Database.php
b/includes/libs/rdbms/database/Database.php
index 7349b63..cec13b5 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -758,7 +758,11 @@
$closed = $this->closeConnection();
$this->mConn = false;
- } elseif ( $this->mTrxIdleCallbacks || $this->mTrxEndCallbacks
) { // sanity
+ } elseif (
+ $this->mTrxIdleCallbacks ||
+ $this->mTrxPreCommitCallbacks ||
+ $this->mTrxEndCallbacks
+ ) { // sanity
throw new RuntimeException( "Transaction callbacks
still pending." );
} else {
$closed = true;
--
To view, visit https://gerrit.wikimedia.org/r/372223
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdc82110c0a0e74bb07ed92ee667bdf0d9f69f90
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
