[Hibernate-commits] Hibernate2/src/net/sf/hibernate/hql PreprocessingParser.java,1.5,1.6

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql
In directory sc8-pr-cvs1:/tmp/cvs-serv14275/net/sf/hibernate/hql

Modified Files:
	PreprocessingParser.java 
Log Message:
got new collection functions working correctly

Index: PreprocessingParser.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hql/PreprocessingParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PreprocessingParser.java	12 Jan 2003 08:21:35 -0000	1.5
--- PreprocessingParser.java	12 Jan 2003 14:22:09 -0000	1.6
***************
*** 97,101 ****
  		else {
  			String prop = (String) collectionProps.get( token.toLowerCase() );
! 			if ( prop!=null ) currentCollectionProp = prop;
  		}
  		
--- 97,104 ----
  		else {
  			String prop = (String) collectionProps.get( token.toLowerCase() );
! 			if ( prop!=null ) {
! 				currentCollectionProp = prop;
! 				return;
! 			}
  		}
  		
***************
*** 107,112 ****
  		else {
  			String doubleToken = (token.length()>1) ?
! 			lastToken + ' ' + token :
! 			lastToken + token;
  			if ( operators.contains( doubleToken.toLowerCase() ) ) {
  				parser.token(doubleToken, q);
--- 110,115 ----
  		else {
  			String doubleToken = (token.length()>1) ?
! 				lastToken + ' ' + token :
! 				lastToken + token;
  			if ( operators.contains( doubleToken.toLowerCase() ) ) {
  				parser.token(doubleToken, q);
***************
*** 135,138 ****
--- 138,143 ----
  		if (lastToken!=null) parser.token(lastToken, q);
  		parser.end(q);
+ 		lastToken=null;
+ 		currentCollectionProp=null;
  	}