Fixed deadlockLoop() IDE errors
authorAaron Schulz <aschulz@wikimedia.org>
Thu, 6 Aug 2015 19:45:30 +0000 (12:45 -0700)
committerAaron Schulz <aschulz@wikimedia.org>
Thu, 6 Aug 2015 19:45:30 +0000 (12:45 -0700)
Change-Id: I76bb9250bc8017756af4f2552cd48ab595a26297

includes/db/Database.php

index 2ee4545..cf0eab7 100644 (file)
@@ -3205,7 +3205,8 @@ abstract class DatabaseBase implements IDatabase {
         * iteration, or false on error, for example if the retry limit was
         * reached.
         *
-        * @return bool
+        * @return mixed
+        * @throws DBQueryError
         */
        public function deadlockLoop() {
                $args = func_get_args();
@@ -3219,6 +3220,7 @@ abstract class DatabaseBase implements IDatabase {
 
                $this->begin( __METHOD__ );
 
+               $retVal = null;
                $e = null;
                do {
                        try {