[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner/worker SqlScanner.java,1.13,1.14

[<de...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker
In directory sc8-pr-cvs1:/tmp/cvs-serv13872/modules/scanner/src/com/babeldoc/scanner/worker

Modified Files:
	SqlScanner.java 
Log Message:
Fixing bug 809462 (http://sourceforge.net/tracker/index.php?func=detail&aid=809462&group_id=56976&atid=482496)
NPE when table contains null column

Index: SqlScanner.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker/SqlScanner.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SqlScanner.java	17 Sep 2003 21:11:58 -0000	1.13
--- SqlScanner.java	24 Sep 2003 13:12:41 -0000	1.14
***************
*** 180,184 ****
          for (int i = 1; i <= columnCount; i++) {
            sb.append("\t\t<" + rs.getMetaData().getColumnLabel(i) + ">");
!           sb.append("<![CDATA[" + rs.getObject(i).toString() + "]]>");
            sb.append("</" + rs.getMetaData().getColumnLabel(i) + ">\n");
          }
--- 180,188 ----
          for (int i = 1; i <= columnCount; i++) {
            sb.append("\t\t<" + rs.getMetaData().getColumnLabel(i) + ">");
!           String data = "";
!           if (rs.getObject(i)!=null) {
!           	data = rs.getObject(i).toString();
!           }
!           sb.append("<![CDATA[" + data + "]]>");
            sb.append("</" + rs.getMetaData().getColumnLabel(i) + ">\n");
          }