Return-Path: Delivered-To: apmail-xerces-commits-archive@www.apache.org Received: (qmail 79462 invoked from network); 9 Sep 2008 15:37:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Sep 2008 15:37:25 -0000 Received: (qmail 53317 invoked by uid 500); 9 Sep 2008 15:37:23 -0000 Delivered-To: apmail-xerces-commits-archive@xerces.apache.org Received: (qmail 53297 invoked by uid 500); 9 Sep 2008 15:37:23 -0000 Mailing-List: contact commits-help@xerces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@xerces.apache.org Received: (qmail 53284 invoked by uid 99); 9 Sep 2008 15:37:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Sep 2008 08:37:23 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Sep 2008 15:36:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EB972238896C; Tue, 9 Sep 2008 08:37:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r693487 - /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java Date: Tue, 09 Sep 2008 15:37:04 -0000 To: commits@xerces.apache.org From: mrglavas@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080909153704.EB972238896C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mrglavas Date: Tue Sep 9 08:37:04 2008 New Revision: 693487 URL: http://svn.apache.org/viewvc?rev=693487&view=rev Log: Fixing a potential NPE. The Javadoc for XMLGrammarPool.retrieveInitialGrammarSet() doesn't explicitly disallow null as a return value. It's possible that some user implementations will return null. Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java Modified: xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java URL: http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java?rev=693487&r1=693486&r2=693487&view=diff ============================================================================== --- xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java (original) +++ xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/dtd/XMLDTDValidator.java Tue Sep 9 08:37:04 2008 @@ -667,9 +667,10 @@ // call handlers // get initial grammars - if(fGrammarPool != null) { + if (fGrammarPool != null) { Grammar [] grammars = fGrammarPool.retrieveInitialGrammarSet(XMLGrammarDescription.XML_DTD); - for(int i = 0; i