[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj DBObject.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj
In directory jcorp2.servlets.net:/tmp/cvs-serv12625/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj

Modified Files:
	DBObject.java 
Log Message:
protect against NP when value object is null


Index: DBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** DBObject.java	1 Aug 2004 07:58:02 -0000	1.199
--- DBObject.java	6 Aug 2004 19:03:39 -0000	1.200
***************
*** 1900,1905 ****
                  if (!datafield.isValueSet()) continue;
  
!                 // use 'raw' value in data field
!                 testObject.setField(fieldName, datafield.getValue().toString());
              }
          }
--- 1900,1910 ----
                  if (!datafield.isValueSet()) continue;
  
!                 Object valObj = datafield.getValue();
!                 String valStr = null;
!                 if (valObj != null) valStr = valObj.toString();
!                 if (valStr != null && valStr.length() > 0) {
!                     // use 'raw' value in data field
!                     testObject.setField(fieldName, datafield.getValue().toString());
!                 }
              }
          }