jenkins-bot has submitted this change and it was merged.
Change subject: Fix IDEA error in safeWaitForPos()
......................................................................
Fix IDEA error in safeWaitForPos()
Change-Id: Iecb023925177be05282f67e48056aeb8f2a9703c
---
M includes/db/loadbalancer/LoadBalancer.php
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/loadbalancer/LoadBalancer.php
b/includes/db/loadbalancer/LoadBalancer.php
index fc7fa13..97df0d6 100644
--- a/includes/db/loadbalancer/LoadBalancer.php
+++ b/includes/db/loadbalancer/LoadBalancer.php
@@ -1391,6 +1391,9 @@
}
$pos = $pos ?: $this->getConnection( DB_MASTER
)->getMasterPos();
+ if ( !$pos ) {
+ return false; // something is misconfigured
+ }
$result = $conn->masterPosWait( $pos, $timeout );
if ( $result == -1 || is_null( $result ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/267383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iecb023925177be05282f67e48056aeb8f2a9703c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
