Author: jvdrean
Date: 2007-11-14 18:57:07 +0100 (Wed, 14 Nov 2007)
New Revision: 5867
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java
Log:
XWIKI-1851 : Cannot upgrade XE 1.1.2 to XE 1.2.x: premature end of file error
Modified:
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java
===================================================================
---
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java
2007-11-14 16:30:33 UTC (rev 5866)
+++
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocumentArchive.java
2007-11-14 17:57:07 UTC (rev 5867)
@@ -185,6 +185,7 @@
XWikiRCSArchive archive = new XWikiRCSArchive(text);
resetArchive();
Collection nodes = archive.getNodes(getId());
+ boolean addNodeInfo = true;
for (Iterator it = nodes.iterator(); it.hasNext();) {
XWikiRCSNodeInfo nodeInfo = (XWikiRCSNodeInfo) it.next();
XWikiRCSNodeContent nodeContent = (XWikiRCSNodeContent)
it.next();
@@ -193,13 +194,15 @@
Version ver = nodeInfo.getVersion();
String xml = archive.getRevisionAsString(ver);
XWikiDocument doc = new XWikiDocument();
- doc.fromXML(xml);
- // set this fields from old document
- nodeInfo.setAuthor(doc.getAuthor());
- nodeInfo.setComment(doc.getComment());
- nodeInfo.setDate(doc.getDate());
+ if (xml.length()>1) {
+ doc.fromXML(xml);
+ // set this fields from old document
+ nodeInfo.setAuthor(doc.getAuthor());
+ nodeInfo.setComment(doc.getComment());
+ nodeInfo.setDate(doc.getDate());
+ }
}
-
+
updateNode(nodeInfo);
updatedNodeInfos.add(nodeInfo);
updatedNodeContents.add(nodeContent);
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
