From a27820692f61842f15e1b75d153b9626a8854fbd Mon Sep 17 00:00:00 2001 From: "Ariel T. Glenn" Date: Wed, 24 Jul 2019 08:56:41 +0300 Subject: [PATCH] make XmlDumpwriter more resilient to blob store corruption Loading content can also throw InvalidArgumentException when the cluster address is an unknown cluster. Bug: T228720 Change-Id: I313f9a5a27b21a33e90639abae3f505640c30e23 --- includes/export/XmlDumpWriter.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/export/XmlDumpWriter.php b/includes/export/XmlDumpWriter.php index f34b3bd9d2..000350662b 100644 --- a/includes/export/XmlDumpWriter.php +++ b/includes/export/XmlDumpWriter.php @@ -310,7 +310,8 @@ class XmlDumpWriter { } catch ( SuppressedDataException $ex ) { return null; } catch ( Exception $ex ) { - if ( $ex instanceof MWException || $ex instanceof RuntimeException ) { + if ( $ex instanceof MWException || $ex instanceof RuntimeException || + $ex instanceof InvalidArgumentException ) { MWDebug::warning( $warning . ': ' . $ex->getMessage() ); return null; } else { -- 2.20.1