# HG changeset patch
# User coffeys
# Date 1407410382 -3600
# Node ID cb7f7486116159f0acb3c3e93a394a35e5500298
# Parent  36ee4ae07575b7f66645a6c12a4ffeb8826454ca# Parent  7637d4b21a9e3237f129f69a0dc7132877f3ab19
Merge

diff -r 36ee4ae07575 -r cb7f74861161 .hgtags
--- a/.hgtags	Tue Jul 22 10:26:12 2014 -0700
+++ b/.hgtags	Thu Aug 07 12:19:42 2014 +0100
@@ -494,9 +494,15 @@
 9e2007e23f356b7bc5d4d0c6c6350e9b3b3cd56b jdk7u71-b03
 f58a7f8db6c54cd76621d1f48d17102ffbe93983 jdk7u71-b04
 edab7f6d9a30feea45bf9185de0c65e11ab3a7b0 jdk7u71-b05
+ca2992ad734eaf8295e21351b0de329555e9e60a jdk7u71-b06
+5fbecd4c30c2e566e9b815818d51042e20d3ab83 jdk7u71-b07
+acf176ea76f904674228745c25af195e460f1240 jdk7u71-b08
 0e7c12377e0120b908fc594afc596ce1f5f2b234 jdk7u72-b01
 bc5b33e920af4b34facfa85a6bf48d5f55b05116 jdk7u72-b02
 b1f6b12c1fcac4b0ea89bf3f134324aa8968b847 jdk7u72-b03
 f59d0ae0995d2cdb57ea482a8fa47575e0d8b57f jdk7u72-b04
 ed071d27bf7320265d8ae527bb622f2e26e1a89c jdk7u72-b05
+d3c5c35f617e33f673420ff9da8051c742513af3 jdk7u72-b06
+ef0842fc31d98031ad9bb514b0f8d2db7bcf4162 jdk7u72-b07
+89117e4403e61b9c033bcab65da30abf2219e385 jdk7u72-b08
 4173f90038ff1764576d08efa34109a7895f106b jdk7u75-b00
diff -r 36ee4ae07575 -r cb7f74861161 src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
--- a/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java	Tue Jul 22 10:26:12 2014 -0700
+++ b/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java	Thu Aug 07 12:19:42 2014 +0100
@@ -54,6 +54,7 @@
 import com.sun.org.apache.xerces.internal.util.SymbolTable;
 import com.sun.org.apache.xerces.internal.util.XMLSymbols;
 import com.sun.org.apache.xerces.internal.utils.SecuritySupport;
+import com.sun.org.apache.xerces.internal.utils.XMLSecurityManager;
 import com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager;
 import com.sun.org.apache.xerces.internal.xni.XNIException;
 import com.sun.org.apache.xerces.internal.xni.grammars.Grammar;
@@ -983,6 +984,18 @@
      */
     public void reset(XMLComponentManager componentManager) throws XMLConfigurationException {
 
+        XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
+        if (spm == null) {
+            spm = new XMLSecurityPropertyManager();
+            setProperty(XML_SECURITY_PROPERTY_MANAGER, spm);
+        }
+
+        XMLSecurityManager sm = (XMLSecurityManager)componentManager.getProperty(SECURITY_MANAGER);
+        if (sm == null)
+            setProperty(SECURITY_MANAGER,new XMLSecurityManager(true));
+
+        faccessExternalSchema = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA);
+
         fGrammarBucket.reset();
 
         fSubGroupHandler.reset();
@@ -1066,9 +1079,6 @@
         // get generate-synthetic-annotations feature
         fSchemaHandler.setGenerateSyntheticAnnotations(componentManager.getFeature(GENERATE_SYNTHETIC_ANNOTATIONS, false));
         fSchemaHandler.reset(componentManager);
-
-        XMLSecurityPropertyManager spm = (XMLSecurityPropertyManager)componentManager.getProperty(XML_SECURITY_PROPERTY_MANAGER);
-        faccessExternalSchema = spm.getValue(XMLSecurityPropertyManager.Property.ACCESS_EXTERNAL_SCHEMA);
     }
 
     private void initGrammarBucket(){