Attachment #58373 for bug #63268




        return valueOf( node );
    }
    
    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 );




import org.jaxen.pattern.Pattern;
import org.jaxen.pattern.PatternParser;

import org.jaxen.saxpath.SAXPathException;

import java.io.StringReader;


        this.context = new Context( getContextSupport() );
    }

    public XPathPattern(String text) throws InvalidXPathException {
        this.text = text;
        this.context = new Context( getContextSupport() );
        try {
            this.pattern = PatternParser.parse( text );
        }
        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 );

Return to bug 63268

Lines 308-320 Link Here

(-)/tmp/portage/dom4j-1.4-r2/work/dom4j-1.4/src/java/org/dom4j/xpath/DefaultXPath.java (-1 / +6 lines)
308	return valueOf( node );	308	return valueOf( node );
309	}	309	}
310		310
311	protected static XPath parse(String text) {	311	protected static XPath parse(String text) throws InvalidXPathException {
312	try {	312	try {
313	return new Dom4jXPath( text );	313	return new Dom4jXPath( text );
314	}	314	}
		315	/*
315	catch (SAXPathException e) {	316	catch (SAXPathException e) {
316	throw new InvalidXPathException( text, e.getMessage() );	317	throw new InvalidXPathException( text, e.getMessage() );
317	}	318	}
		319	*/
		320	catch (JaxenException e) {
		321	throw new InvalidXPathException( text, e.getMessage() );
		322	}
318	catch (RuntimeException e) {	323	catch (RuntimeException e) {
319	}	324	}
320	throw new InvalidXPathException( text );	325	throw new InvalidXPathException( text );

Lines 26-32 Link Here

(-)/tmp/portage/dom4j-1.4-r2/work/dom4j-1.4/src/java/org/dom4j/xpath/XPathPattern.java (-4 / +7 lines)
26	import org.jaxen.pattern.Pattern;	26	import org.jaxen.pattern.Pattern;
27	import org.jaxen.pattern.PatternParser;	27	import org.jaxen.pattern.PatternParser;
28		28
29	import org.saxpath.SAXPathException;	29	import org.jaxen.saxpath.SAXPathException;
30		30
31	import java.io.StringReader;	31	import java.io.StringReader;
32		32
Lines 57-70 Link Here
57	this.context = new Context( getContextSupport() );	57	this.context = new Context( getContextSupport() );
58	}	58	}
59		59
60	public XPathPattern(String text) {	60	public XPathPattern(String text) throws InvalidXPathException {
61	this.text = text;	61	this.text = text;
62	this.context = new Context( getContextSupport() );	62	this.context = new Context( getContextSupport() );
63	try {	63	try {
64	this.pattern = PatternParser.parse( text );	64	this.pattern = PatternParser.parse( text );
65	}	65	}
66	catch (SAXPathException e) {	66	catch (JaxenException e) {
67	throw new InvalidXPathException( text, e.getMessage() );	67	throw new InvalidXPathException(text, e.getMessage());
		68	}
		69	catch (SAXPathException e) {
		70	throw new InvalidXPathException(text, e.getMessage());
68	}	71	}
69	catch (RuntimeException e) {	72	catch (RuntimeException e) {
70	throw new InvalidXPathException( text );	73	throw new InvalidXPathException( text );