mkwan 2003/03/13 10:40:07
Modified: java/src/org/apache/xalan/xsltc/dom Tag: XSLTC_DTM
MultiDOM.java
java/src/org/apache/xalan/xsltc/runtime Tag: XSLTC_DTM
StringValueHandler.java
Log:
Fix a bug which causes the docbook testcase to fail.
Revision Changes Path
No revision
No revision
1.16.10.18 +25 -7 xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java
Index: MultiDOM.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java,v
retrieving revision 1.16.10.17
retrieving revision 1.16.10.18
diff -u -r1.16.10.17 -r1.16.10.18
--- MultiDOM.java 12 Mar 2003 20:17:39 -0000 1.16.10.17
+++ MultiDOM.java 13 Mar 2003 18:40:07 -0000 1.16.10.18
@@ -115,7 +115,9 @@
public void setRestartable(boolean flag) {
- _source.setRestartable(flag);
+ if (_source != null) {
+ _source.setRestartable(flag);
+ }
}
public DTMAxisIterator setStartNode(final int node) {
@@ -151,11 +153,21 @@
}
public int getLast() {
- return _source.getLast();
+ if (_source != null) {
+ return _source.getLast();
+ }
+ else {
+ return END;
+ }
}
public int getPosition() {
- return _source.getPosition();
+ if (_source != null) {
+ return _source.getPosition();
+ }
+ else {
+ return END;
+ }
}
public boolean isReverse() {
@@ -163,16 +175,22 @@
}
public void setMark() {
- _source.setMark();
+ if (_source != null) {
+ _source.setMark();
+ }
}
public void gotoMark() {
- _source.gotoMark();
+ if (_source != null) {
+ _source.gotoMark();
+ }
}
public DTMAxisIterator cloneIterator() {
final AxisIterator clone = new AxisIterator(_axis, _type);
- clone._source = _source.cloneIterator();
+ if (_source != null) {
+ clone._source = _source.cloneIterator();
+ }
clone._mask = _mask;
return clone;
}
No revision
No revision
1.3.2.6 +5 -1
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/StringValueHandler.java
Index: StringValueHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/StringValueHandler.java,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -r1.3.2.5 -r1.3.2.6
--- StringValueHandler.java 7 Mar 2003 20:38:54 -0000 1.3.2.5
+++ StringValueHandler.java 13 Mar 2003 18:40:07 -0000 1.3.2.6
@@ -86,6 +86,10 @@
System.arraycopy(ch, off, _buffer, _free, len);
_free += len;
*/
+ if (_str != null) {
+ _buffer.append(_str);
+ _str = null;
+ }
_buffer.append(ch, off, len);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
