[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/xml XMLBeanReader.java, 1.12, 1.13

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/xml
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7280/fw/src/net/sourceforge/squirrel_sql/fw/xml

Modified Files:
	XMLBeanReader.java 
Log Message:
Bug 2942351: check for null rather than throw an NPE.

Index: XMLBeanReader.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/xml/XMLBeanReader.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** XMLBeanReader.java	28 Nov 2009 20:14:51 -0000	1.12
--- XMLBeanReader.java	20 Feb 2010 01:19:48 -0000	1.13
***************
*** 135,145 ****
  			parser.setReader(new StdXMLReader(rdr));
  			IXMLElement element = (IXMLElement) parser.parse();
! 			Iterator it = new EnumerationIterator(element.enumerateChildren());
! 			while (it.hasNext())
  			{
! 				final IXMLElement elem = (IXMLElement) it.next();
! 				if (isBeanElement(elem))
  				{
! 					_beanColl.add(loadBean(elem));
  				}
  			}
--- 135,151 ----
  			parser.setReader(new StdXMLReader(rdr));
  			IXMLElement element = (IXMLElement) parser.parse();
! 			// Bug 2942351 (Program doesn't launch)
! 			// looking at the source for StdXMLBuilder, it appears that parser.parse() could possibly return 
! 			// null.  So check for null here and skip if necessary.
! 			if (element != null) 
  			{
! 				Iterator it = new EnumerationIterator(element.enumerateChildren());
! 				while (it.hasNext())
  				{
! 					final IXMLElement elem = (IXMLElement) it.next();
! 					if (isBeanElement(elem))
! 					{
! 						_beanColl.add(loadBean(elem));
! 					}
  				}
  			}