Return-Path: Delivered-To: apmail-incubator-abdera-commits-archive@locus.apache.org Received: (qmail 73416 invoked from network); 2 Apr 2007 15:51:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Apr 2007 15:51:26 -0000 Received: (qmail 15393 invoked by uid 500); 2 Apr 2007 15:51:33 -0000 Delivered-To: apmail-incubator-abdera-commits-archive@incubator.apache.org Received: (qmail 15383 invoked by uid 500); 2 Apr 2007 15:51:33 -0000 Mailing-List: contact abdera-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: abdera-dev@incubator.apache.org Delivered-To: mailing list abdera-commits@incubator.apache.org Received: (qmail 15372 invoked by uid 99); 2 Apr 2007 15:51:33 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2007 08:51:33 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2007 08:51:25 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 781021A9838; Mon, 2 Apr 2007 08:51:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r524805 - /incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java Date: Mon, 02 Apr 2007 15:51:04 -0000 To: abdera-commits@incubator.apache.org From: jmsnell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070402155104.781021A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jmsnell Date: Mon Apr 2 08:51:03 2007 New Revision: 524805 URL: http://svn.apache.org/viewvc?view=rev&rev=524805 Log: Throw a ParseException instead of OMException when dealing with invalid XML. e.g., entry.setContent("", "application/foo+xml"); Used to throw an OMException. Now it throws ParseException. Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java?view=diff&rev=524805&r1=524804&r2=524805 ============================================================================== --- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java (original) +++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMBuilder.java Mon Apr 2 08:51:03 2007 @@ -27,6 +27,7 @@ import org.apache.abdera.model.Document; import org.apache.abdera.model.Element; import org.apache.abdera.model.Text; +import org.apache.abdera.parser.ParseException; import org.apache.abdera.parser.ParserOptions; import org.apache.abdera.util.Constants; import org.apache.axiom.om.OMConstants; @@ -240,13 +241,15 @@ lastNode = createOMText(XMLStreamConstants.ENTITY_REFERENCE); break; default : - throw new OMException(); + throw new ParseException(); } return token; - } catch (OMException e) { + } catch (ParseException e) { throw e; + } catch (OMException e) { + throw new ParseException(e); } catch (Exception e) { - throw new OMException(e); + throw new ParseException(e); } }