Brion VIBBER has submitted this change and it was merged.
Change subject: Fix edge case missed in length processing
......................................................................
Fix edge case missed in length processing
If rev was deleted, can end up with null somehow. Fun!
Change-Id: Iabc79d9d83599b5f9741e99e9722297b02681c00
---
M src/org/mediawiki/importer/XmlDumpReader.java
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/src/org/mediawiki/importer/XmlDumpReader.java
b/src/org/mediawiki/importer/XmlDumpReader.java
index 01c01c7..aa25b12 100644
--- a/src/org/mediawiki/importer/XmlDumpReader.java
+++ b/src/org/mediawiki/importer/XmlDumpReader.java
@@ -426,7 +426,7 @@
void readText() {
rev.Text = bufferContentsOrNull();
if (rev.Text==null && !deleted) rev.Text = ""; //NOTE: null
means deleted/supressed
- if (rev.Bytes == null) {
+ if (rev.Text != null && rev.Bytes == null) {
try {
rev.Bytes = rev.Text.getBytes("UTF-8").length;
} catch (UnsupportedEncodingException ex) {
--
To view, visit https://gerrit.wikimedia.org/r/258492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iabc79d9d83599b5f9741e99e9722297b02681c00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/mwdumper
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
