dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "rdbms: make LoadBalancer::doWait() cast $timeout to an integer"
[lhc/web/wiklou.git]
/
includes
/
libs
/
rdbms
/
loadbalancer
/
LoadBalancer.php
diff --git
a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index
e2d3b33
..
96ea949
100644
(file)
--- a/
includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/
includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@
-590,7
+590,7
@@
class LoadBalancer implements ILoadBalancer {
* @return bool
*/
protected function doWait( $index, $open = false, $timeout = null ) {
* @return bool
*/
protected function doWait( $index, $open = false, $timeout = null ) {
- $timeout = max( 1,
$timeout ?: $this->waitTimeout
);
+ $timeout = max( 1,
intval( $timeout ?: $this->waitTimeout )
);
// Check if we already know that the DB has reached this point
$server = $this->getServerName( $index );
// Check if we already know that the DB has reached this point
$server = $this->getServerName( $index );