From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 29 Jan 2016 22:47:38 +0000 (-0800)
Subject: Fix IDEA error in safeWaitForPos()
X-Git-Tag: 1.31.0-rc.0~8150
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=982869d6b0c145d7b53aad255efaf0702c434e1f;p=lhc%2Fweb%2Fwiklou.git

Fix IDEA error in safeWaitForPos()

Change-Id: Iecb023925177be05282f67e48056aeb8f2a9703c
---

diff --git a/includes/db/loadbalancer/LoadBalancer.php b/includes/db/loadbalancer/LoadBalancer.php
index fc7fa13223..97df0d698c 100644
--- a/includes/db/loadbalancer/LoadBalancer.php
+++ b/includes/db/loadbalancer/LoadBalancer.php
@@ -1391,6 +1391,9 @@ class LoadBalancer {
 		}
 
 		$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 ) ) {