Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #145 from shabanovd/develop

improve exception message
  • Loading branch information...
commit 9c73044b722891d3d5cea79bbad5c15de0296a40 2 parents 2a4f66d + 51ec8d2
@adamretter adamretter authored
Showing with 4 additions and 3 deletions.
  1. +4 −3 src/org/exist/backup/restore/SystemImportHandler.java
View
7 src/org/exist/backup/restore/SystemImportHandler.java
@@ -26,8 +26,8 @@
import org.w3c.dom.DocumentType;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
-
import org.exist.Namespaces;
import org.exist.collections.Collection;
import org.exist.collections.IndexInfo;
@@ -45,7 +45,6 @@
import org.exist.xquery.value.DateTimeValue;
import java.net.URISyntaxException;
-
import java.util.Calendar;
import java.util.Date;
import java.util.Observable;
@@ -54,9 +53,9 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+
import org.apache.log4j.Logger;
import org.exist.backup.BackupDescriptor;
-import org.exist.backup.RestoreHandler;
import org.exist.backup.restore.listener.RestoreListener;
import org.exist.security.ACLPermission.ACE_ACCESS_TYPE;
import org.exist.security.ACLPermission.ACE_TARGET;
@@ -274,6 +273,8 @@ private void restoreSubCollectionEntry(Attributes atts) throws SAXException {
reader.setContentHandler(handler);
reader.parse(is);
+ } catch(final SAXParseException e) {
+ throw new SAXException("Could not process collection: " + descriptor.getSymbolicPath(name, false), e);
} catch(final ParserConfigurationException pce) {
throw new SAXException("Could not initalise SAXParser for processing sub-collection: " + descriptor.getSymbolicPath(name, false), pce);
} catch(final IOException ioe) {
Please sign in to comment.
Something went wrong with that request. Please try again.