mkwan 2002/12/22 15:28:07
Modified: java/src/org/apache/xpath/objects
XRTreeFragSelectWrapper.java
Log:
For Bugzilla 15373. Change the execute() method to always return a XString
object. Also change the type to CLASS_STRING.
Revision Changes Path
1.7 +6 -3
xml-xalan/java/src/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
Index: XRTreeFragSelectWrapper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XRTreeFragSelectWrapper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XRTreeFragSelectWrapper.java 19 Sep 2002 19:52:26 -0000 1.6
+++ XRTreeFragSelectWrapper.java 22 Dec 2002 23:28:07 -0000 1.7
@@ -53,7 +53,10 @@
{
m_selected = ((Expression)m_obj).execute(xctxt);
m_selected.allowDetachToRelease(m_allowRelease);
- return m_selected;
+ if (m_selected.getType() == CLASS_STRING)
+ return m_selected;
+ else
+ return new XString(m_selected.str());
}
/**
@@ -112,11 +115,11 @@
/**
* Tell what kind of class this is.
*
- * @return the type of the select expression
+ * @return the string type
*/
public int getType()
{
- return m_selected.getType();
+ return CLASS_STRING;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
