# HG changeset patch
# User asaha
# Date 1412263887 25200
# Node ID 54c70f4e70851121e1da34e9bc8d17a7a047931a
# Parent  e12c89ec1cee4f7c2532c7f6a295049e45444ec1# Parent  e8ab19435208726b1334ba8e7928ea154e0959b3
Merge

diff -r e12c89ec1cee -r 54c70f4e7085 .hgtags
--- a/.hgtags	Thu Sep 11 11:02:15 2014 -0700
+++ b/.hgtags	Thu Oct 02 08:31:27 2014 -0700
@@ -507,3 +507,18 @@
 f7542072016b7972b383075f84df29bc05495d2e jdk7u71-b11
 109dd4c4a07a8adfaf59e11c29e502277b803c44 jdk7u71-b12
 df2c7c9a3609f8f4b30b09c29a9cfddc8b4b90ef jdk7u71-b13
+018049539cc25653eeba682b3ca5abcd63839d78 jdk7u71-b14
+0e7c12377e0120b908fc594afc596ce1f5f2b234 jdk7u72-b01
+bc5b33e920af4b34facfa85a6bf48d5f55b05116 jdk7u72-b02
+b1f6b12c1fcac4b0ea89bf3f134324aa8968b847 jdk7u72-b03
+f59d0ae0995d2cdb57ea482a8fa47575e0d8b57f jdk7u72-b04
+ed071d27bf7320265d8ae527bb622f2e26e1a89c jdk7u72-b05
+d3c5c35f617e33f673420ff9da8051c742513af3 jdk7u72-b06
+ef0842fc31d98031ad9bb514b0f8d2db7bcf4162 jdk7u72-b07
+89117e4403e61b9c033bcab65da30abf2219e385 jdk7u72-b08
+7637d4b21a9e3237f129f69a0dc7132877f3ab19 jdk7u72-b09
+a3d6d3327b32cd7fb41a144d48f957170dde3ba8 jdk7u72-b10
+d3fbd111daa01dc1737afd0a59084e14664d581a jdk7u72-b11
+fb713c907f33689a418c87bf721dafcdc9616ca8 jdk7u72-b12
+8f0d267ca63ab2f9d7839604ae88fafbcc0ad2d4 jdk7u72-b13
+fec38133453a8d70d4c528595ae1cab47909c4bd jdk7u72-b14
diff -r e12c89ec1cee -r 54c70f4e7085 src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
--- a/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java	Thu Sep 11 11:02:15 2014 -0700
+++ b/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java	Thu Oct 02 08:31:27 2014 -0700
@@ -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(){