jenkins-bot has submitted this change and it was merged.
Change subject: Only call getData() if the right type of Action is used
......................................................................
Only call getData() if the right type of Action is used
Bug: T132625
Change-Id: I0b46e315d9c92df29cf395751d7281c67f1e293c
---
M includes/DataSender.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Smalyshev: Looks good to me, approved
Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/DataSender.php b/includes/DataSender.php
index 9c683f9..8dcea92 100644
--- a/includes/DataSender.php
+++ b/includes/DataSender.php
@@ -355,7 +355,11 @@
} elseif ( $logCallback ) {
// This is generally not an error but we should
// log it to see how many we get
- $id =
$bulkResponse->getAction()->getData()->getId();
+ $action = $bulkResponse->getAction();
+ $id = 'missing';
+ if ( $action instanceof
\Elastica\Bulk\Action\AbstractDocument ) {
+ $id = $action->getData()->getId();
+ }
call_user_func( $logCallback, $id );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/283561
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b46e315d9c92df29cf395751d7281c67f1e293c
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Cindy-the-browser-test-bot <bernhardsone...@gmail.com>
Gerrit-Reviewer: DCausse <dcau...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: Manybubbles <never...@wikimedia.org>
Gerrit-Reviewer: Smalyshev <smalys...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
