diff options
| author | asaha <none@none> | 2016-01-25 14:49:04 -0800 |
|---|---|---|
| committer | asaha <none@none> | 2016-01-25 14:49:04 -0800 |
| commit | 04330f619b1eacd364d1d55afdcb82c84399c67f (patch) | |
| tree | d9f6a7ab7a1699a3e585598bf57a5b07c0d5c3f1 /src | |
| parent | becdf4a23257000af9ae00df4660376ab1f3e1da (diff) | |
| parent | daa2e8473d11e6d88770b00c103a1b261bf49068 (diff) | |
| download | jdk8u_jaxp-04330f619b1eacd364d1d55afdcb82c84399c67f.tar.gz | |
Merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java | 5 | ||||
| -rw-r--r-- | src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java index 5e8e742..e136357 100644 --- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java +++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java @@ -36,6 +36,7 @@ import com.sun.org.apache.xml.internal.serializer.ElemDesc; import com.sun.org.apache.xml.internal.serializer.ToHTMLStream; import java.util.ArrayList; import java.util.HashMap; +import java.util.Hashtable; import java.util.List; import java.util.Map; import java.util.Set; @@ -104,9 +105,9 @@ final class LiteralElement extends Instruction { } } - // Check if we have any declared namesaces + // Check if we have any declared namespaces if (_accessedPrefixes == null) { - _accessedPrefixes = new HashMap<>(); + _accessedPrefixes = new Hashtable<>(); } else { if (!declared) { diff --git a/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java index fc46488..0b8fb90 100644 --- a/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java +++ b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java @@ -975,6 +975,7 @@ public abstract class XMLScanner fStringBuffer2.append('\n'); } } else if (c != -1 && XMLChar.isHighSurrogate(c)) { + fStringBuffer3.clear(); if (scanSurrogates(fStringBuffer3)) { stringBuffer.append(fStringBuffer3); if (entityDepth == fEntityDepth && fNeedNonNormalizedValue) { |