You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by sa...@apache.org on 2002/06/01 00:20:57 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/parsers DOMASBuilderImpl.java
sandygao 2002/05/31 15:20:57
Modified: java/src/org/apache/xerces/parsers DOMASBuilderImpl.java
Log:
Potential NPE. When the returned grammar from grammar loader is null,
return null from parseAS methods.
Revision Changes Path
1.19 +7 -4 xml-xerces/java/src/org/apache/xerces/parsers/DOMASBuilderImpl.java
Index: DOMASBuilderImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/parsers/DOMASBuilderImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DOMASBuilderImpl.java 27 May 2002 23:09:19 -0000 1.18
+++ DOMASBuilderImpl.java 31 May 2002 22:20:57 -0000 1.19
@@ -87,7 +87,7 @@
*
* @author Pavani Mukthipudi, Sun Microsystems Inc.
* @author Neil Graham, IBM
- * @version $Id: DOMASBuilderImpl.java,v 1.18 2002/05/27 23:09:19 neilg Exp $
+ * @version $Id: DOMASBuilderImpl.java,v 1.19 2002/05/31 22:20:57 sandygao Exp $
*
*/
@@ -292,9 +292,12 @@
SchemaGrammar grammar = gramConfig.parseXMLSchema(is);
gramConfig.unlockGrammarPool();
- ASModelImpl newAsModel = new ASModelImpl();
- fGrammarBucket.putGrammar (grammar, true);
- addGrammars(newAsModel, fGrammarBucket);
+ ASModelImpl newAsModel = null;
+ if (grammar != null) {
+ newAsModel = new ASModelImpl();
+ fGrammarBucket.putGrammar (grammar, true);
+ addGrammars(newAsModel, fGrammarBucket);
+ }
return newAsModel;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org