Skip to content

Commit

Permalink
Merge pull request #66 from mukulga/xalan-j_master_mukul
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mukulga authored Aug 28, 2023
2 parents 690bd04 + be0d250 commit 92781cb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
14 changes: 0 additions & 14 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,3 @@ within the test build conf.xsltc's output).
4) whitespace35 https://issues.apache.org/jira/browse/XALANJ-2643

These XSLT transformation issues, do not exist with the XalanJ interpretive processor.

4.4 From folder xalan-test/tests/2.7.3_release, run the batch file 2.7.3_release.bat (for Windows) or
shell script 2.7.3_release.sh (for Linux) to run certain tests, specific to XalanJ 2.7.3 and higher versions.

The final result of running this tests batch file/shell script (point 4.4), for these test's success should
be following,
The xalanj integer truncation bug fix test passed!
The test case passed [xalan_interpretive : jira_xalanj_2584]!
The test case passed [xalan_xsltc : jira_xalanj_2584]!
The test case passed [xalan_interpretive : jira_xalanj_2623]!
The test case passed [xalan_xsltc : jira_xalanj_2623]!

Users may read information within the batch file 2.7.3_release.bat or shell script 2.7.3_release.sh, to know
more about these tests (i.e, point 4.4).
6 changes: 5 additions & 1 deletion src/org/apache/xpath/VariableStack.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
*/
package org.apache.xpath;

import javax.xml.transform.SourceLocator;
import javax.xml.transform.TransformerException;

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

org.apache.xml.utils.PrefixResolver prefixResolver =
xctxt.getNamespaceContext();

SourceLocator srcLocator = xctxt.getSAXLocator();

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

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

0 comments on commit 92781cb

Please sign in to comment.