You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@locus.apache.org on 2000/12/16 18:01:22 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath Arg.java VariableStack.java
sboag 00/12/16 09:01:21
Modified: java/src/org/apache/xpath Arg.java VariableStack.java
Log:
Fixed regression that occured when the Arg#equality function
was removed.
Revision Changes Path
1.6 +18 -0 xml-xalan/java/src/org/apache/xpath/Arg.java
Index: Arg.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/Arg.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Arg.java 2000/12/15 21:28:54 1.5
+++ Arg.java 2000/12/16 17:01:20 1.6
@@ -204,6 +204,24 @@
m_isParamVar = false;
m_expression = null;
}
+
+ /**
+ * Equality function specialized for the variable name. If the argument
+ * is not a qname, it will deligate to the super class.
+ *
+ * @param obj the reference object with which to compare.
+ * @return <code>true</code> if this object is the same as the obj
+ * argument; <code>false</code> otherwise.
+ */
+ public boolean equals(Object obj)
+ {
+ if(obj instanceof QName)
+ {
+ return m_qname.equals(obj);
+ }
+ else
+ return super.equals(obj);
+ }
/**
* Construct a parameter argument.
1.13 +1 -1 xml-xalan/java/src/org/apache/xpath/VariableStack.java
Index: VariableStack.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/VariableStack.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- VariableStack.java 2000/11/23 04:58:55 1.12
+++ VariableStack.java 2000/12/16 17:01:21 1.13
@@ -355,7 +355,7 @@
{
Arg arg = (Arg) elementAt(i);
- if (arg.equals(name))
+ if (arg.getQName().equals(name))
{
XObject val = arg.getVal();
if(val.getType() == XObject.CLASS_UNRESOLVEDVARIABLE)