[patch] fixes the exception throwing of dom4j-1.4

dom4j-1.4-exceptions.patch (text/plain), 2.32 KB, created by Josh Nichols (RETIRED) on 2005-05-08 12:07:57 UTC

diff -ru /tmp/portage/dom4j-1.4-r2/work/dom4j-1.4/src/java/org/dom4j/xpath/DefaultXPath.java /tmp/dom4j-1.4/src/java/org/dom4j/xpath/DefaultXPath.java
--- /tmp/portage/dom4j-1.4-r2/work/dom4j-1.4/src/java/org/dom4j/xpath/DefaultXPath.java	2003-04-07 16:51:33.000000000 -0400
+++ /tmp/dom4j-1.4/src/java/org/dom4j/xpath/DefaultXPath.java	2005-05-08 05:14:44.000000000 -0400
@@ -308,13 +308,18 @@
         return valueOf( node );
     }
     
-    protected static XPath parse(String text) {        
+    protected static XPath parse(String text) throws InvalidXPathException {        
         try {
             return new Dom4jXPath( text );
         }
+	/*
         catch (SAXPathException e) {
             throw new InvalidXPathException( text, e.getMessage() );
         }
+	*/
+        catch (JaxenException e) {
+            throw new InvalidXPathException( text, e.getMessage() );
+        }
         catch (RuntimeException e) {
         }
         throw new InvalidXPathException( text );
diff -ru /tmp/portage/dom4j-1.4-r2/work/dom4j-1.4/src/java/org/dom4j/xpath/XPathPattern.java /tmp/dom4j-1.4/src/java/org/dom4j/xpath/XPathPattern.java
--- /tmp/portage/dom4j-1.4-r2/work/dom4j-1.4/src/java/org/dom4j/xpath/XPathPattern.java	2003-04-07 16:51:31.000000000 -0400
+++ /tmp/dom4j-1.4/src/java/org/dom4j/xpath/XPathPattern.java	2005-05-08 05:33:44.000000000 -0400
@@ -26,7 +26,7 @@
 import org.jaxen.pattern.Pattern;
 import org.jaxen.pattern.PatternParser;
 
-import org.saxpath.SAXPathException;
+import org.jaxen.saxpath.SAXPathException;
 
 import java.io.StringReader;
 
@@ -57,14 +57,17 @@
         this.context = new Context( getContextSupport() );
     }
 
-    public XPathPattern(String text) {
+    public XPathPattern(String text) throws InvalidXPathException {
         this.text = text;
         this.context = new Context( getContextSupport() );
         try {
             this.pattern = PatternParser.parse( text );
         }
-        catch (SAXPathException e) {
-            throw new InvalidXPathException( text, e.getMessage() );
+        catch (JaxenException e) {
+            throw new InvalidXPathException(text, e.getMessage());
+        }
+	catch (SAXPathException e) {
+            throw new InvalidXPathException(text, e.getMessage());
         }
         catch (RuntimeException e) {
             throw new InvalidXPathException( text );