Merge "Fix ParserOutput::getText 'unwrap' flag for end-of-doc comment"

[lhc/web/wiklou.git] / includes / libs / rdbms / lbfactory / LBFactorySingle.php

diff --git a/includes/libs/rdbms/lbfactory/LBFactorySingle.php b/includes/libs/rdbms/lbfactory/LBFactorySingle.php
index f992643..587ab23 100644 (file)
--- a/includes/libs/rdbms/lbfactory/LBFactorySingle.php
+++ b/includes/libs/rdbms/lbfactory/LBFactorySingle.php
@@ -23,8 +23,6 @@
 
 namespace Wikimedia\Rdbms;
 
-use LoadBalancerSingle;
-use IDatabase;
 use InvalidArgumentException;
 use BadMethodCallException;
 
@@ -104,6 +102,8 @@ class LBFactorySingle extends LBFactory {
         * @param array $params
         */
        public function forEachLB( $callback, array $params = [] ) {
-               call_user_func_array( $callback, array_merge( [ $this->lb ], $params ) );
+               if ( isset( $this->lb ) ) { // may not be set during _destruct()
+                       call_user_func_array( $callback, array_merge( [ $this->lb ], $params ) );
+               }
        }
 }