From 982869d6b0c145d7b53aad255efaf0702c434e1f Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 29 Jan 2016 14:47:38 -0800 Subject: [PATCH] Fix IDEA error in safeWaitForPos() Change-Id: Iecb023925177be05282f67e48056aeb8f2a9703c --- includes/db/loadbalancer/LoadBalancer.php | 3 +++ 1 file changed, 3 insertions(+) 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 ) ) { -- 2.20.1