jenkins-bot has submitted this change and it was merged.
Change subject: Check for EntityLookupException in ModifyEntity
......................................................................
Check for EntityLookupException in ModifyEntity
not sure this fixes the problems with merging,
but could be related and this is appearing in the
error logs.
Bug: T115892
Change-Id: Iaf9e6fe6b913464cd1af0ee0be0c739eb2ecdb6c
---
M repo/includes/api/ModifyEntity.php
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Addshore: Looks good to me, but someone else must approve
JanZerebecki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/ModifyEntity.php
b/repo/includes/api/ModifyEntity.php
index 487f81a..118b92f 100644
--- a/repo/includes/api/ModifyEntity.php
+++ b/repo/includes/api/ModifyEntity.php
@@ -18,6 +18,7 @@
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParsingException;
+use Wikibase\DataModel\Services\Lookup\EntityLookupException;
use Wikibase\EntityRevision;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\EntityStore;
@@ -207,7 +208,12 @@
try {
$entityRevision =
$this->revisionLookup->getEntityRevision( $entityId, $baseRevisionId );
+ } catch ( EntityLookupException $ex ) {
+ $this->errorReporter->dieException( $ex,
'no-such-entity' );
} catch ( StorageException $ex ) {
+ // @fixme EntityRevisionLookup still throws
BadRevisionException, which
+ // is a subclass of StorageException, so we
still have some inconsistency
+ // and need to check both.
$this->errorReporter->dieException( $ex,
'no-such-entity' );
}
--
To view, visit https://gerrit.wikimedia.org/r/247464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf9e6fe6b913464cd1af0ee0be0c739eb2ecdb6c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
