[Exist-commits] eXist-1.0/src/org/exist/dom ElementImpl.java,1.40,1.41 AbstractNodeSet.java,1.22,1.23

[Wolfgang M. M. <wol...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/dom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21812/src/org/exist/dom

Modified Files:
	ElementImpl.java AbstractNodeSet.java 
Log Message:
Fixed xquery caching bug in "order by" clause, which leads to a NullPointerException in 
DOMFile.getNodeValue.

Index: ElementImpl.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/ElementImpl.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** ElementImpl.java	21 Jun 2004 15:27:36 -0000	1.40
--- ElementImpl.java	30 Jun 2004 15:56:59 -0000	1.41
***************
*** 449,454 ****
  				if ((ownerDocument.reindex < 0
  					|| ownerDocument.reindex > ownerDocument.getTreeLevel(gid))
! 					&& index)
  				    ownerDocument.broker.index(attrib, lastPath);
  				return attrib;
  			case Node.COMMENT_NODE :
--- 449,455 ----
  				if ((ownerDocument.reindex < 0
  					|| ownerDocument.reindex > ownerDocument.getTreeLevel(gid))
! 					&& index) {
  				    ownerDocument.broker.index(attrib, lastPath);
+ 				}
  				return attrib;
  			case Node.COMMENT_NODE :

Index: AbstractNodeSet.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/AbstractNodeSet.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** AbstractNodeSet.java	23 Jun 2004 12:44:09 -0000	1.22
--- AbstractNodeSet.java	30 Jun 2004 15:56:59 -0000	1.23
***************
*** 263,268 ****
  		    if(al.getLength() == 1)
  		        return hasChildrenInSet(al.get(0), mode, rememberContext);
! //		    else
! //		        return quickSelectParentChild(al, mode, rememberContext);
  		}
  		NodeProxy n, p;
--- 263,268 ----
  		    if(al.getLength() == 1)
  		        return hasChildrenInSet(al.get(0), mode, rememberContext);
! 		    else
! 		        return quickSelectParentChild(al, mode, rememberContext);
  		}
  		NodeProxy n, p;