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

[Larry Hamel]

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

Modified Files:
	DBObject.java 
Log Message:
protect against having no pool called 'default' (e.g., for testing)


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.189
retrieving revision 1.190
diff -C2 -d -r1.189 -r1.190
*** DBObject.java	27 Apr 2004 20:25:09 -0000	1.189
--- DBObject.java	4 May 2004 22:07:40 -0000	1.190
***************
*** 71,75 ****
  import com.jcorporate.expresso.core.cache.Cacheable;
  import com.jcorporate.expresso.core.controller.Transition;
! import com.jcorporate.expresso.core.dataobjects.*;
  import com.jcorporate.expresso.core.dataobjects.jdbc.FieldRangeParser;
  import com.jcorporate.expresso.core.dataobjects.jdbc.JDBCDataObject;
--- 71,82 ----
  import com.jcorporate.expresso.core.cache.Cacheable;
  import com.jcorporate.expresso.core.controller.Transition;
! import com.jcorporate.expresso.core.dataobjects.BaseDataObject;
! import com.jcorporate.expresso.core.dataobjects.DataException;
! import com.jcorporate.expresso.core.dataobjects.DataField;
! import com.jcorporate.expresso.core.dataobjects.DataFieldMetaData;
! import com.jcorporate.expresso.core.dataobjects.DataObject;
! import com.jcorporate.expresso.core.dataobjects.DataObjectMetaData;
! import com.jcorporate.expresso.core.dataobjects.DataTransferObject;
! import com.jcorporate.expresso.core.dataobjects.DefaultDataField;
  import com.jcorporate.expresso.core.dataobjects.jdbc.FieldRangeParser;
  import com.jcorporate.expresso.core.dataobjects.jdbc.JDBCDataObject;
***************
*** 80,84 ****
  import com.jcorporate.expresso.core.db.DBException;
  import com.jcorporate.expresso.core.db.exception.DBRecordNotFoundException;
! import com.jcorporate.expresso.core.misc.*;
  import com.jcorporate.expresso.core.security.filters.Filter;
  import com.jcorporate.expresso.kernel.util.ClassLocator;
--- 87,97 ----
  import com.jcorporate.expresso.core.db.DBException;
  import com.jcorporate.expresso.core.db.exception.DBRecordNotFoundException;
! import com.jcorporate.expresso.core.misc.CacheEvent;
! import com.jcorporate.expresso.core.misc.CacheEventListener;
! import com.jcorporate.expresso.core.misc.ConfigJdbc;
! import com.jcorporate.expresso.core.misc.ConfigManager;
! import com.jcorporate.expresso.core.misc.ConfigurationException;
! import com.jcorporate.expresso.core.misc.DateTime;
! import com.jcorporate.expresso.core.misc.StringUtil;
  import com.jcorporate.expresso.core.security.filters.Filter;
  import com.jcorporate.expresso.kernel.util.ClassLocator;
***************
*** 92,96 ****
  import org.apache.oro.text.regex.Perl5Matcher;
  
! import java.io.*;
  import java.lang.reflect.Method;
  import java.math.BigDecimal;
--- 105,113 ----
  import org.apache.oro.text.regex.Perl5Matcher;
  
! import java.io.ByteArrayInputStream;
! import java.io.IOException;
! import java.io.InputStream;
! import java.io.ObjectInputStream;
! import java.io.ObjectOutputStream;
  import java.lang.reflect.Method;
  import java.math.BigDecimal;
***************
*** 98,102 ****
  import java.text.NumberFormat;
  import java.text.ParseException;
! import java.util.*;
  
  
--- 115,128 ----
  import java.text.NumberFormat;
  import java.text.ParseException;
! import java.util.ArrayList;
! import java.util.Collections;
! import java.util.Enumeration;
! import java.util.HashMap;
! import java.util.Hashtable;
! import java.util.Iterator;
! import java.util.Locale;
! import java.util.Map;
! import java.util.StringTokenizer;
! import java.util.Vector;
  
  
***************
*** 4719,4730 ****
                  setupFields();
  
!                 //We have to force default here because no data context has been
!                 //set.  So this is a semi bug in that checkZeroUpdate is determined
!                 //by the default pool only.
!                 DBConnectionPool tempPool = DBConnectionPool.getInstance("default");
!                 if (tempPool != null) {
!                     getDef().setCheckZeroUpdate(tempPool.getCheckZeroUpdate());
                  }
-                 tempPool = null;
              }
          }
--- 4745,4759 ----
                  setupFields();
  
!                 try {
!                     //We have to force default here because no data context has been
!                     //set.  So checkZeroUpdate is determined
!                     //by the default pool only; or false if cannot find that context
!                     DBConnectionPool tempPool = DBConnectionPool.getInstance("default");
!                     if (tempPool != null) {
!                         getDef().setCheckZeroUpdate(tempPool.getCheckZeroUpdate());
!                     }
!                 } catch (DBException e) {
!                     getDef().setCheckZeroUpdate(false);
                  }
              }
          }