dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
39fe056
)
Fix IDEA error in safeWaitForPos()
author
Aaron Schulz
<aschulz@wikimedia.org>
Fri, 29 Jan 2016 22:47:38 +0000
(14:47 -0800)
committer
Aaron Schulz
<aschulz@wikimedia.org>
Fri, 29 Jan 2016 22:47:38 +0000
(14:47 -0800)
Change-Id: Iecb023925177be05282f67e48056aeb8f2a9703c
includes/db/loadbalancer/LoadBalancer.php
patch
|
blob
|
history
diff --git
a/includes/db/loadbalancer/LoadBalancer.php
b/includes/db/loadbalancer/LoadBalancer.php
index
fc7fa13
..
97df0d6
100644
(file)
--- 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 ) ) {