From 7b997f4ae582b7138580ce273e736cd54d420425 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 21 Aug 2015 13:04:09 -0700
Subject: [PATCH] Fixed IDE error in mergeViaLock()

Change-Id: I50b5a22bf353272ad6960181db07c2f4ec857f3c
---
 includes/libs/objectcache/BagOStuff.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/libs/objectcache/BagOStuff.php b/includes/libs/objectcache/BagOStuff.php
index d72e1a551e..006acf3311 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -200,10 +200,11 @@ abstract class BagOStuff implements LoggerAwareInterface {
 
 		$this->clearLastError();
 		$currentValue = $this->get( $key );
-		if ( !$this->getLastError() ) {
+		if ( $this->getLastError() ) {
+			$success = false;
+		} else {
 			// Derive the new value from the old value
 			$value = call_user_func( $callback, $this, $key, $currentValue );
-
 			if ( $value === false ) {
 				$success = true; // do nothing
 			} else {
-- 
2.20.1