Mercurial > hg > openjdk > jdk8 > jaxp

changeset 566:2a8fce63503a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kizune
date Tue, 03 Dec 2013 14:13:08 +0400
parents 932684ede1c6 (current diff) 6b37ae056340 (diff)
children 5be9182ceb48
files src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java
diffstat 2 files changed, 14 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Nov 27 14:28:06 2013 -0800
+++ b/.hgtags	Tue Dec 03 14:13:08 2013 +0400
@@ -236,3 +236,7 @@
 c1f9158fbb9c2da50f6946fffd974e8236e08447 jdk8-b112
 0046d2278204b7eff76803fc4623cb48c7e6384d jdk8-b113
 1b1e12117fe2840e5d21ae9a4b309e4f981f3ea8 jdk8-b114
+f610fd46463e6b0533dd92bce11a1e7d84984e64 jdk8-b115
+e757eb9aee3d6bec7da074c47e07616104a8df33 jdk8-b116
+c1d234d4f16472a5163464420fa00b25ffa5298a jdk8-b117
+e4e5069250e717defcb556e2f6be291460988c51 jdk8-b118
--- a/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java	Wed Nov 27 14:28:06 2013 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java	Tue Dec 03 14:13:08 2013 +0400
@@ -74,12 +74,12 @@
             DocumentBuilderFactory.newInstance();
     private boolean _internal = true;
 
-    public SAX2DOM(boolean useServicesMachnism) throws ParserConfigurationException {
-        _document = createDocument(useServicesMachnism);
+    public SAX2DOM(boolean useServicesMechanism) throws ParserConfigurationException {
+        _document = createDocument(useServicesMechanism);
         _root = _document;
     }
 
-    public SAX2DOM(Node root, Node nextSibling, boolean useServicesMachnism) throws ParserConfigurationException {
+    public SAX2DOM(Node root, Node nextSibling, boolean useServicesMechanism) throws ParserConfigurationException {
         _root = root;
         if (root instanceof Document) {
           _document = (Document)root;
@@ -88,15 +88,15 @@
           _document = root.getOwnerDocument();
         }
         else {
-          _document = createDocument(useServicesMachnism);
+          _document = createDocument(useServicesMechanism);
           _root = _document;
         }
 
         _nextSibling = nextSibling;
     }
 
-    public SAX2DOM(Node root, boolean useServicesMachnism) throws ParserConfigurationException {
-        this(root, null, useServicesMachnism);
+    public SAX2DOM(Node root, boolean useServicesMechanism) throws ParserConfigurationException {
+        this(root, null, useServicesMechanism);
     }
 
     public Node getDOM() {
@@ -308,18 +308,19 @@
     public void startDTD(String name, String publicId, String systemId)
         throws SAXException {}
 
-    private Document createDocument(boolean useServicesMachnism) throws ParserConfigurationException {
+    private Document createDocument(boolean useServicesMechanism) throws ParserConfigurationException {
         if (_factory == null) {
-            if (useServicesMachnism)
+            if (useServicesMechanism) {
                 _factory = DocumentBuilderFactory.newInstance();
                 if (!(_factory instanceof com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl)) {
                     _internal = false;
                 }
-            else
+            } else {
                 _factory = DocumentBuilderFactory.newInstance(
                   "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl",
                   SAX2DOM.class.getClassLoader()
                   );
+            }
         }
         Document doc;
         if (_internal) {