Skip to content

Commit 92781cb

Browse files
authored
Merge pull request #66 from mukulga/xalan-j_master_mukul
committing minor changes to xalanj README file, as per the following change that was done earlier : movement of the 2.7.3_release test cases to jira directory. also making a minor improvement to error handling within xalanj implementation codebase, when variables were not been resolved within an xslt 1.0 stylesheet.
2 parents 690bd04 + be0d250 commit 92781cb

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

README

-14
Original file line numberDiff line numberDiff line change
@@ -121,17 +121,3 @@ within the test build conf.xsltc's output).
121121
4) whitespace35 https://issues.apache.org/jira/browse/XALANJ-2643
122122

123123
These XSLT transformation issues, do not exist with the XalanJ interpretive processor.
124-
125-
4.4 From folder xalan-test/tests/2.7.3_release, run the batch file 2.7.3_release.bat (for Windows) or
126-
shell script 2.7.3_release.sh (for Linux) to run certain tests, specific to XalanJ 2.7.3 and higher versions.
127-
128-
The final result of running this tests batch file/shell script (point 4.4), for these test's success should
129-
be following,
130-
The xalanj integer truncation bug fix test passed!
131-
The test case passed [xalan_interpretive : jira_xalanj_2584]!
132-
The test case passed [xalan_xsltc : jira_xalanj_2584]!
133-
The test case passed [xalan_interpretive : jira_xalanj_2623]!
134-
The test case passed [xalan_xsltc : jira_xalanj_2623]!
135-
136-
Users may read information within the batch file 2.7.3_release.bat or shell script 2.7.3_release.sh, to know
137-
more about these tests (i.e, point 4.4).

src/org/apache/xpath/VariableStack.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
*/
2121
package org.apache.xpath;
2222

23+
import javax.xml.transform.SourceLocator;
2324
import javax.xml.transform.TransformerException;
2425

2526
import org.apache.xalan.res.XSLMessages;
@@ -501,6 +502,8 @@ public XObject getVariableOrParam(
501502

502503
org.apache.xml.utils.PrefixResolver prefixResolver =
503504
xctxt.getNamespaceContext();
505+
506+
SourceLocator srcLocator = xctxt.getSAXLocator();
504507

505508
// Get the current ElemTemplateElement, which must be pushed in as the
506509
// prefix resolver, and then walk backwards in document order, searching
@@ -541,7 +544,8 @@ public XObject getVariableOrParam(
541544
return getGlobalVariable(xctxt, vvar.getIndex());
542545
}
543546

544-
throw new javax.xml.transform.TransformerException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_VAR_NOT_RESOLVABLE, new Object[]{qname.toString()})); //"Variable not resolvable: " + qname);
547+
throw new javax.xml.transform.TransformerException(XSLMessages.createXPATHMessage(XPATHErrorResources.ER_VAR_NOT_RESOLVABLE,
548+
new Object[]{qname.toString()}), srcLocator); //"Variable not resolvable: " + qname);
545549
}
546550
} // end VariableStack
547551

0 commit comments

Comments
 (0)