Changeset 5367 for OAIHarvester

Timestamp:

06/17/14 15:48:14 (10 years ago)

Author:

Oliver Schonefeld

Message:

• don't trigger an InvalidArgumentExecption? in case of certain parsing errors

File:

• OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/Response.java (modified) (2 diffs)

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/Response.java

@@ -228 +228 @@
             // System.err.println("--> error, not found @ " +
             // toReadable(reader));
+            String what;
+            if (reader.isStartElement() || reader.isEndElement() ||
+                    reader.isEmptyElement()) {
+                what = "'" + reader.getName().toString() + "'";
+            } else {
+                what = "some character data";
+            }
             throw new XMLStreamException("expected element '" +
-                    new QName(namespaceURI, localName) + "', but found '" +
-                    reader.getName() + "'", reader.getLocation());
+                    new QName(namespaceURI, localName) + "', but found "+
+                    what, reader.getLocation());
         }
         // System.err.println("--> not found @ " + toReadable(reader));
@@ -279 +286 @@
                         break;
                     } else {
+                        String what;
+                        if (reader.isStartElement() || reader.isEndElement() ||
+                                reader.isEmptyElement()) {
+                            what = "'" + reader.getName().toString() + "'";
+                        } else {
+                            what = "some character data";
+                        }
                         throw new XMLStreamException("expected end tag for '" +
                                 new QName(namespaceURI, localName) +
-                                "', but found '" + reader.getName() + "'",
+                                "', but found " + what,
                                 reader.getLocation());
                     }