sboag 02/03/21 16:53:08
Modified: java/src/org/apache/xpath XPathContext.java
Log:
Merge from redundent expression elemination branch.
Revision Changes Path
1.37 +7 -3 xml-xalan/java/src/org/apache/xpath/XPathContext.java
Index: XPathContext.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPathContext.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- XPathContext.java 12 Mar 2002 14:56:38 -0000 1.36
+++ XPathContext.java 22 Mar 2002 00:53:08 -0000 1.37
@@ -375,6 +375,7 @@
if(m_rtfdtm_stack!=null)
for (java.util.Enumeration e = m_rtfdtm_stack.elements() ;
e.hasMoreElements() ;)
m_dtmManager.release((DTM)e.nextElement(), true);
+
m_rtfdtm_stack=null; // drop our references too
m_which_rtfdtm=-1;
@@ -725,7 +726,10 @@
*/
public final void popContextNodeList()
{
- m_contextNodeLists.pop();
+ if(m_contextNodeLists.isEmpty())
+ System.err.println("Warning: popContextNodeList when stack is
empty!");
+ else
+ m_contextNodeLists.pop();
}
/**
@@ -1263,7 +1267,7 @@
{
m_rtfdtm_stack=new Vector();
rtfdtm=(SAX2RTFDTM)m_dtmManager.getDTM(null,true,null,false,false);
- m_rtfdtm_stack.addElement(rtfdtm);
+ m_rtfdtm_stack.addElement(rtfdtm);
++m_which_rtfdtm;
}
else
@@ -1282,7 +1286,7 @@
else
{
rtfdtm=(SAX2RTFDTM)m_dtmManager.getDTM(null,true,null,false,false);
- m_rtfdtm_stack.addElement(rtfdtm);
+ m_rtfdtm_stack.addElement(rtfdtm);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
