morten 01/10/04 05:19:34
Modified: java/src/org/apache/xalan/xsltc/dom DOMImpl.java
Log:
Fix for a regression in a string-value function in the DOM.
The string returned from <xsl:value-of select="/"/> included PIs.
PR: n/a
Obtained from: n/a
Submitted by: [EMAIL PROTECTED]
Reviewed by: [EMAIL PROTECTED]
Revision Changes Path
1.36 +9 -7
xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMImpl.java
Index: DOMImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/DOMImpl.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- DOMImpl.java 2001/09/25 19:45:03 1.35
+++ DOMImpl.java 2001/10/04 12:19:33 1.36
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: DOMImpl.java,v 1.35 2001/09/25 19:45:03 morten Exp $
+ * @(#)$Id: DOMImpl.java,v 1.36 2001/10/04 12:19:33 morten Exp $
*
* The Apache Software License, Version 1.1
*
@@ -2550,11 +2550,12 @@
public String getElementValue(final int element) {
// optimization: only create StringBuffer if > 1 child
final int child = _offsetOrChild[element];
- return child != NULL
- ? (_type[child] == TEXT && _nextSibling[child] == NULL
- ? makeStringValue(child)
- : stringValueAux(new StringBuffer(), element).toString())
- : EMPTYSTRING;
+ if (child == NULL)
+ return EMPTYSTRING;
+ if ((_type[child] == TEXT) && (_nextSibling[child] == NULL))
+ return makeStringValue(child);
+ else
+ return stringValueAux(new StringBuffer(), element).toString();
}
/**
@@ -2573,11 +2574,12 @@
_lengthOrAttr[child]);
break;
case PROCESSING_INSTRUCTION:
+ /* This method should not return anything for PIs
buffer.append(_text,
_offsetOrChild[child],
_lengthOrAttr[child]);
+ */
break;
- // !!! at the moment default can only be an element???
default:
stringValueAux(buffer, child);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
