[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-serv31485/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj

Modified Files:
	DBObject.java 
Log Message:
protect against NP


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.198
retrieving revision 1.199
diff -C2 -d -r1.198 -r1.199
*** DBObject.java	16 Jul 2004 01:30:27 -0000	1.198
--- DBObject.java	1 Aug 2004 07:58:02 -0000	1.199
***************
*** 2002,2009 ****
                  // does local field have a value set?
                  DataField datafield = getDataField(localField);
!                 if ( !datafield.isValueSet() ) continue;
  
                  // only set field if we have a value
!                 String value = datafield.getValue().toString();
                  if (value != null && value.length() > 0) {
                      detailObj.setField(foreignField, value);
--- 2002,2011 ----
                  // does local field have a value set?
                  DataField datafield = getDataField(localField);
!                 if (datafield == null || !datafield.isValueSet()) continue;
  
                  // only set field if we have a value
!                 Object valObj = datafield.getValue();
!                 String value = null;
!                 if (valObj != null) value = valObj.toString();
                  if (value != null && value.length() > 0) {
                      detailObj.setField(foreignField, value);