Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 42588 invoked from network); 15 Feb 2004 10:06:55 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 15 Feb 2004 10:06:55 -0000 Received: (qmail 49021 invoked by uid 500); 15 Feb 2004 10:06:29 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 48871 invoked by uid 500); 15 Feb 2004 10:06:28 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 48860 invoked by uid 500); 15 Feb 2004 10:06:28 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 48850 invoked from network); 15 Feb 2004 10:06:28 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 15 Feb 2004 10:06:28 -0000 Received: (qmail 42548 invoked by uid 1638); 15 Feb 2004 10:06:53 -0000 Date: 15 Feb 2004 10:06:53 -0000 Message-ID: <20040215100653.42547.qmail@minotaur.apache.org> From: bruno@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser XPointerFrameworkParser.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bruno 2004/02/15 02:06:53 Modified: src/java/org/apache/cocoon/components/xpointer/parser XPointerFrameworkParser.java Log: improved error handling Revision Changes Path 1.6 +7 -1 cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java Index: XPointerFrameworkParser.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- XPointerFrameworkParser.java 24 Sep 2003 21:41:12 -0000 1.5 +++ XPointerFrameworkParser.java 15 Feb 2004 10:06:53 -0000 1.6 @@ -68,7 +68,13 @@ public static XPointer parse(String xpointer) throws ParseException { XPointerFrameworkParser xfp = new XPointerFrameworkParser(new java.io.StringReader(xpointer)); - xfp.pointer(); + try { + xfp.pointer(); + } catch (TokenMgrError e) { + // Rethrow TokenMgrErrors as ParseExceptions, because errors aren't caught by Cocoon, + // and mistyping in a xpointer isn't such a grave error + throw new ParseException(e.getMessage()); + } return xfp.getXPointer(); }