From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 10 Feb 2017 20:00:44 +0000 (-0800)
Subject: Type check the APC value in LoadBalancer::doWait()
X-Git-Tag: 1.31.0-rc.0~4104
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=473b200a7d49ee25f2838cec84c6833b71d05fa2;p=lhc%2Fweb%2Fwiklou.git

Type check the APC value in LoadBalancer::doWait()

Change-Id: If00cd5fd2ace828ce03824ec7b5735de7d950dec
---

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 532a8edc39..900a79ca4d 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -491,7 +491,10 @@ class LoadBalancer implements ILoadBalancer {
 		$key = $this->srvCache->makeGlobalKey( __CLASS__, 'last-known-pos', $server );
 		/** @var DBMasterPos $knownReachedPos */
 		$knownReachedPos = $this->srvCache->get( $key );
-		if ( $knownReachedPos && $knownReachedPos->hasReached( $this->mWaitForPos ) ) {
+		if (
+			$knownReachedPos instanceof DBMasterPos &&
+			$knownReachedPos->hasReached( $this->mWaitForPos )
+		) {
 			$this->replLogger->debug( __METHOD__ .
 				": replica DB $server known to be caught up (pos >= $knownReachedPos)." );
 			return true;