Changeset 5368 for SRUClient

Timestamp:

06/17/14 16:03:15 (10 years ago)

Author:

Oliver Schonefeld

Message:

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

File:

• SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUXMLStreamReader.java (modified) (4 diffs)

SRUClient/trunk/src/main/java/eu/clarin/sru/client/SRUXMLStreamReader.java

@@ -422 +422 @@
             // 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));
@@ -455 +462 @@
                 }
                 if (reader.isStartElement()) {
-                    if (!(namespaceURI.equals(reader.getNamespaceURI()) && localName
-                            .equals(reader.getLocalName()))) {
+                    if (!(namespaceURI.equals(reader.getNamespaceURI()) &&
+                            localName.equals(reader.getLocalName()))) {
                         level++;
                     }
@@ -473 +480 @@
                         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() + "'",
-                                reader.getLocation());
+                                "', but found " + what, reader.getLocation());
                     }
                 }
@@ -518 +531 @@
     }
 
-        
+
     String readContent(String namespaceURI, String localName, boolean required,
             boolean contentRequired) throws XMLStreamException {