jenkins-bot has submitted this change and it was merged.
Change subject: Fixed IDE error in mergeViaLock()
......................................................................
Fixed IDE error in mergeViaLock()
Change-Id: I50b5a22bf353272ad6960181db07c2f4ec857f3c
---
M includes/libs/objectcache/BagOStuff.php
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/libs/objectcache/BagOStuff.php
b/includes/libs/objectcache/BagOStuff.php
index d72e1a5..006acf3 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -200,10 +200,11 @@
$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 {
--
To view, visit https://gerrit.wikimedia.org/r/233041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I50b5a22bf353272ad6960181db07c2f4ec857f3c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
