[Exist-commits] eXist-1.0/src/org/exist/dom NodeProxy.java,1.90,1.91

[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-serv323/src/org/exist/dom

Modified Files:
	NodeProxy.java 
Log Message:
clearContext temporarily disabled. May lead to an infinite loop in queries.

Index: NodeProxy.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/dom/NodeProxy.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** NodeProxy.java	18 Jan 2006 15:21:26 -0000	1.90
--- NodeProxy.java	18 Jan 2006 16:20:37 -0000	1.91
***************
*** 461,484 ****
      
      public void clearContext(int contextId) {
!         if (contextId == Expression.IGNORE_CONTEXT) {
!             context = null;
!             return;
!         }
!         ContextItem newContext = null;
!         ContextItem last = null;
!         ContextItem next = context;
!         while (next != null) {
!             if (next.getContextId() != contextId) {
!                 if (newContext == null) {
!                     newContext = next;
!                 } else {
!                     last.setNextContextItem(next);
!                 }
!                 last = next;
!                 last.setNextContextItem(null);
!             }
!             next = next.getNextDirect();
!         }
!         this.context = newContext;
      }
      
--- 461,486 ----
      
      public void clearContext(int contextId) {
!         context = null;
!         return;
! //        if (contextId == Expression.IGNORE_CONTEXT) {
! //            context = null;
! //            return;
! //        }
! //        ContextItem newContext = null;
! //        ContextItem last = null;
! //        ContextItem next = context;
! //        while (next != null) {
! //            if (next.getContextId() != contextId) {
! //                if (newContext == null) {
! //                    newContext = next;
! //                } else {
! //                    last.setNextContextItem(next);
! //                }
! //                last = next;
! //                last.setNextContextItem(null);
! //            }
! //            next = next.getNextDirect();
! //        }
! //        this.context = newContext;
      }