Mercurial > hg > icedtea8-forest > jaxp
changeset 2101:de624afa6e75 jdk8u222-b05 jdk8u232-b00
8193830: Xalan Update: Xalan Java 2.7.2
Reviewed-by: lancea, clanger, andrew
author | stooke |
---|---|
date | Wed, 05 Jun 2019 04:08:13 +0100 |
parents | 99d96dc6231e |
children | e18fe3687a51 |
files | THIRD_PARTY_README src/com/sun/org/apache/xalan/internal/Version.java src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java src/com/sun/org/apache/xml/internal/utils/NodeVector.java |
diffstat | 8 files changed, 21 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/THIRD_PARTY_README Wed Jun 05 03:24:01 2019 +0100 +++ b/THIRD_PARTY_README Wed Jun 05 04:08:13 2019 +0100 @@ -2898,7 +2898,7 @@ Apache Jakarta BCEL 5.1 Apache Jakarta Regexp 1.4 Apache Santuario XML Security for Java 1.5.4 - Apache Xalan-Java 2.7.1 + Apache Xalan-Java 2.7.2 Apache Xerces Java 2.10.0 Apache XML Resolver 1.1
--- a/src/com/sun/org/apache/xalan/internal/Version.java Wed Jun 05 03:24:01 2019 +0100 +++ b/src/com/sun/org/apache/xalan/internal/Version.java Wed Jun 05 04:08:13 2019 +0100 @@ -121,7 +121,7 @@ */ public static int getMaintenanceVersionNum() { - return 0; + return 2; } /**
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java Wed Jun 05 03:24:01 2019 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java Wed Jun 05 04:08:13 2019 +0100 @@ -100,20 +100,19 @@ * the specified method is found in the specifed class. */ private boolean hasMethods() { - LiteralExpr arg = (LiteralExpr)_arg; // Get the class name from the namespace uri String className = getClassNameFromUri(_namespaceOfFunct); // Get the method name from the argument to function-available String methodName = null; - int colonIndex = _nameOfFunct.indexOf(":"); + int colonIndex = _nameOfFunct.indexOf(':'); if (colonIndex > 0) { String functionName = _nameOfFunct.substring(colonIndex+1); int lastDotIndex = functionName.lastIndexOf('.'); if (lastDotIndex > 0) { methodName = functionName.substring(lastDotIndex+1); - if (className != null && !className.equals("")) + if (className != null && className.length() != 0) className = className + "." + functionName.substring(0, lastDotIndex); else className = functionName.substring(0, lastDotIndex);
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java Wed Jun 05 03:24:01 2019 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java Wed Jun 05 04:08:13 2019 +0100 @@ -65,7 +65,7 @@ private AttributeValue _order; private AttributeValue _caseOrder; private AttributeValue _dataType; - private String _lang; // bug! see 26869 + private AttributeValue _lang; // bug! see 26869, see XALANJ-2546 private String _className = null; private ArrayList<VariableRefBase> _closureVars = null; @@ -153,13 +153,11 @@ } _dataType = AttributeValue.create(this, val, parser); - _lang = getAttribute("lang"); // bug! see 26869 - // val = getAttribute("lang"); - // _lang = AttributeValue.create(this, val, parser); + val = getAttribute("lang"); + _lang = AttributeValue.create(this, val, parser); // Get the case order; default is language dependant - val = getAttribute("case-order"); - _caseOrder = AttributeValue.create(this, val, parser); - + val = getAttribute("case-order"); + _caseOrder = AttributeValue.create(this, val, parser); } /** @@ -178,6 +176,7 @@ _order.typeCheck(stable); _caseOrder.typeCheck(stable); _dataType.typeCheck(stable); + _lang.typeCheck(stable); return Type.Void; } @@ -195,16 +194,14 @@ _order.translate(classGen, methodGen); } - public void translateCaseOrder(ClassGenerator classGen, + public void translateCaseOrder(ClassGenerator classGen, MethodGenerator methodGen) { - _caseOrder.translate(classGen, methodGen); + _caseOrder.translate(classGen, methodGen); } public void translateLang(ClassGenerator classGen, MethodGenerator methodGen) { - final ConstantPoolGen cpg = classGen.getConstantPool(); - final InstructionList il = methodGen.getInstructionList(); - il.append(new PUSH(cpg, _lang)); // bug! see 26869 + _lang.translate(classGen, methodGen); } /**
--- a/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java Wed Jun 05 03:24:01 2019 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java Wed Jun 05 04:08:13 2019 +0100 @@ -570,7 +570,7 @@ if (_openElementName != null) { int index; - if ((index =_openElementName.indexOf(":")) < 0) + if ((index =_openElementName.indexOf(':')) < 0) _dom.startElement(null, _openElementName, _openElementName, _attributes); else { String uri =_dom.getNamespaceURI(_openElementName.substring(0,index)); @@ -682,7 +682,7 @@ public void addAttribute(String qName, String value) { // "prefix:localpart" or "localpart" - int colonpos = qName.indexOf(":"); + int colonpos = qName.indexOf(':'); String uri = EMPTY_STRING; String localName = qName; if (colonpos >0)
--- a/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Wed Jun 05 03:24:01 2019 +0100 +++ b/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java Wed Jun 05 04:08:13 2019 +0100 @@ -1421,8 +1421,8 @@ * This method should only be invoked if the name attribute is an AVT */ public static void checkAttribQName(String name) { - final int firstOccur = name.indexOf(":"); - final int lastOccur = name.lastIndexOf(":"); + final int firstOccur = name.indexOf(':'); + final int lastOccur = name.lastIndexOf(':'); final String localName = name.substring(lastOccur + 1); if (firstOccur > 0) {
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java Wed Jun 05 03:24:01 2019 +0100 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java Wed Jun 05 04:08:13 2019 +0100 @@ -359,7 +359,7 @@ while (low <= high) { - int mid = (low + high) / 2; + int mid = (low + high) >>> 1; int c = list[mid]; if (c > value)
--- a/src/com/sun/org/apache/xml/internal/utils/NodeVector.java Wed Jun 05 03:24:01 2019 +0100 +++ b/src/com/sun/org/apache/xml/internal/utils/NodeVector.java Wed Jun 05 04:08:13 2019 +0100 @@ -670,9 +670,9 @@ /* * Pick a pivot and move it out of the way */ - int pivot = a[(lo + hi) / 2]; - - a[(lo + hi) / 2] = a[hi]; + int mid = (lo + hi) >>> 1; + int pivot = a[mid]; + a[mid] = a[hi]; a[hi] = pivot; while (lo < hi)