[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj MultiDBObject.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-serv16693/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj

Modified Files:
	MultiDBObject.java 
Log Message:
allow null sortkeystring for searchAndRetrieveList(), which will clear sorts (rather than throw)


Index: MultiDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** MultiDBObject.java	4 May 2004 22:15:54 -0000	1.42
--- MultiDBObject.java	3 Jul 2004 06:14:13 -0000	1.43
***************
*** 1377,1391 ****
      public synchronized List searchAndRetrieveList(String sortKeyString) throws DBException {
  
!         if (sortKeys == null) {
!             String myName = (thisClass + "searchAndRetrieveList(String)");
!             throw new DBException(myName + ":Sort keys null");
!         }
! 
!         sortKeys.removeAllElements();
! 
!         StringTokenizer stk = new StringTokenizer(sortKeyString, "|");
! 
!         while (stk.hasMoreTokens()) {
!             sortKeys.addElement(stk.nextToken());
          }
  
--- 1377,1386 ----
      public synchronized List searchAndRetrieveList(String sortKeyString) throws DBException {
  
!         sortKeys.clear();
!         if (sortKeys != null) {
!             StringTokenizer stk = new StringTokenizer(sortKeyString, "|");
!             while (stk.hasMoreTokens()) {
!                 sortKeys.addElement(stk.nextToken());
!             }
          }