Fix issue #121 by making sure the last captured exception is thrown a…

…fter we run out of schemes
ndw · Sep 21, 2013 · 47ab9c9 · 47ab9c9
1 parent 1368482
commit 47ab9c9
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/com/xmlcalabash/util/XPointer.java b/src/com/xmlcalabash/util/XPointer.java
@@ -66,18 +66,21 @@ public Vector<XdmNode> selectNodes(XProcRuntime runtime, XdmNode doc) {
 
     public String selectText(InputStreamReader stream, int contentLength) {
         String result = null;
+        RuntimeException except = null;
 
         for (XPointerScheme scheme : parts) {
             String select = scheme.textEquivalent();
             if (result == null && select != null) {
                 try {
                     result = scheme.selectText(stream, contentLength);
                 } catch (IllegalArgumentException iae) {
-                    result = null;
                     // in this case we will never have started reading the file, so we're good to go
-                } catch (XProcException xe) {
+                    except = iae;
                     result = null;
+                } catch (XProcException xe) {
                     // try the next one
+                    except = xe;
+                    result = null;
                     try {
                         stream.reset();
                     } catch (IOException ioe) {
@@ -87,6 +90,10 @@ public String selectText(InputStreamReader stream, int contentLength) {
             }
         }
 
+        if (result == null && except != null) {
+            throw except;
+        }
+
         return result;
     }