Mercurial > hg > release > icedtea7-forest-2.4 > jaxp

changeset 791:8f220f7b51c7 icedtea-2.4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup Oracle's mess
author andrew
date Wed, 16 Oct 2013 15:26:07 +0100
parents 45c1bb989620
children 582213f5560e
files src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java src/com/sun/xml/internal/stream/Entity.java
diffstat 2 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java	Wed Oct 16 15:26:07 2013 +0100
@@ -41,7 +41,6 @@
 import com.sun.org.apache.xerces.internal.util.PropertyState;
 import com.sun.org.apache.xerces.internal.util.Status;
 import com.sun.org.apache.xerces.internal.util.SymbolTable;
-import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
 import com.sun.org.apache.xerces.internal.xni.XMLLocator;
 import com.sun.org.apache.xerces.internal.xni.XNIException;
 import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool;
@@ -161,8 +160,6 @@
     protected static final String LOCALE =
         Constants.XERCES_PROPERTY_PREFIX + Constants.LOCALE_PROPERTY;
 
-    /** Property identifier: Security manager. */
-    private static final String SECURITY_MANAGER = Constants.SECURITY_MANAGER;
 
     // debugging
 
@@ -332,8 +329,7 @@
             DATATYPE_VALIDATOR_FACTORY,
             VALIDATION_MANAGER,
             GENERATE_SYNTHETIC_ANNOTATIONS,
-            LOCALE,
-            SECURITY_MANAGER
+            LOCALE
         };
         addRecognizedProperties(recognizedProperties);
 
@@ -368,8 +364,6 @@
 
         fVersionDetector = new XMLVersionDetector();
 
-        fProperties.put(SECURITY_MANAGER, new XMLSecurityManager(true));
-
         // add message formatters
         if (fErrorReporter.getMessageFormatter(XMLMessageFormatter.XML_DOMAIN) == null) {
             XMLMessageFormatter xmft = new XMLMessageFormatter();
--- a/src/com/sun/xml/internal/stream/Entity.java	Wed Jul 24 15:21:29 2013 +0400
+++ b/src/com/sun/xml/internal/stream/Entity.java	Wed Oct 16 15:26:07 2013 +0100
@@ -248,7 +248,7 @@
         public int fBufferSize = DEFAULT_BUFFER_SIZE;
 
         /** Default buffer size before we've finished with the XMLDecl:  */
-        public static final int DEFAULT_XMLDECL_BUFFER_SIZE = 64;
+        public static final int DEFAULT_XMLDECL_BUFFER_SIZE = 28;
 
         /** Default internal entity buffer size (1024). */
         public static final int DEFAULT_INTERNAL_BUFFER_SIZE = 1024;