Return-Path: Delivered-To: apmail-incubator-abdera-commits-archive@locus.apache.org Received: (qmail 38909 invoked from network); 7 Nov 2006 16:31:16 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Nov 2006 16:31:16 -0000 Received: (qmail 94916 invoked by uid 500); 7 Nov 2006 16:31:14 -0000 Delivered-To: apmail-incubator-abdera-commits-archive@incubator.apache.org Received: (qmail 94890 invoked by uid 500); 7 Nov 2006 16:31:14 -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 94577 invoked by uid 99); 7 Nov 2006 16:31:13 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Nov 2006 08:31:13 -0800 X-ASF-Spam-Status: No, hits=-9.4 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; Tue, 07 Nov 2006 08:31:01 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 451601A9846; Tue, 7 Nov 2006 08:30:34 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r472152 - /incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMParser.java Date: Tue, 07 Nov 2006 16:30:34 -0000 To: abdera-commits@incubator.apache.org From: rooneg@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061107163034.451601A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rooneg Date: Tue Nov 7 08:30:33 2006 New Revision: 472152 URL: http://svn.apache.org/viewvc?view=rev&rev=472152 Log: Fix ABDERA-22, calling the Parser#parse(Reader r) method without passing in a base argument always throws a NullPointerException. [ in parser/src/main/java/org/apache/abdera/parser/stax ] * FOMParser.java (parse): Don't pass a null base into IRI's constructor, instead recognize it and pass a null base IRI into getDocument. Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMParser.java Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMParser.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMParser.java?view=diff&rev=472152&r1=472151&r2=472152 ============================================================================== --- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMParser.java (original) +++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMParser.java Tue Nov 7 08:30:33 2006 @@ -128,7 +128,7 @@ FOMFactory factory = getFomFactory(options); XMLStreamReader xmlreader = StAXUtils.createXMLStreamReader(in); FOMBuilder builder = new FOMBuilder(factory, xmlreader, options); - document = getDocument(builder, new IRI(base)); + document = getDocument(builder, base != null ? new IRI(base) : null); setCharset(options, xmlreader.getCharacterEncodingScheme(), document); } catch (Exception e) { if (!(e instanceof ParseException))