From a619be816390e13dadd03082da170d26f2ee54d2 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 16 Aug 2017 21:25:29 -0700 Subject: [PATCH] database: make close() sanity check mTrxPreCommitCallbacks The other callback types are already checked too. Change-Id: Ibdc82110c0a0e74bb07ed92ee667bdf0d9f69f90 --- includes/libs/rdbms/database/Database.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index 7349b63a59..cec13b50ee 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -758,7 +758,11 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware $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; -- 2.20.1