# HG changeset patch
# User andrew
# Date 1422319571 0
# Node ID 91f042201bb67d4eb55167a9406bf929f66b7210
# Parent  4809b329ad87ab1e87c6f2c8ba6b529447f8025e# Parent  4efcb94971a21562649ae01c07880139a35d3403
Merge jdk7u75-b31

diff -r 4809b329ad87 -r 91f042201bb6 .hgtags
--- a/.hgtags	Wed Jan 21 03:56:40 2015 +0000
+++ b/.hgtags	Tue Jan 27 00:46:11 2015 +0000
@@ -506,6 +506,11 @@
 4e323af07c47061109fb5f585613b0cc4b4208ca jdk7u65-b40
 a5f829d7fa05cf769402dfc82c94b737b8d011b0 jdk7u65-b31
 f33ea72260ca7480f4a1405d35a3709895b491a2 jdk7u65-b33
+d1f8566d39c56e40516a1afb304ed7c0681355d8 jdk7u67-b01
+a9c1c53386a9b7856802a98a597a8cbf73e28fa0 jdk7u67-b31
+e7300cd38793c7620f39be5f73b7fcba2f80555b jdk7u67-b32
+78c4bc9bfa12cc97039fd84c5ec1cbd086a0ba35 jdk7u67-b33
+39a6fbc6ef75eba7b3c28e8485a0665d904f21eb jdk7u67-b34
 86e93799766d67102a37559b3831abcc825d7e24 jdk7u66-b00
 d34839cb2f15dee01cdfb1fd93378849de34d662 jdk7u66-b01
 19e4e978c8212921104ba16d0db6bf18c6f8d0ab jdk7u66-b09
@@ -535,3 +540,35 @@
 bd7f82f68cf1733bc70f3b8eaf0a618b87d16171 icedtea-2.5.4pre02
 95795ef2016e32978b6cf76d52942d4c3f9a7fed icedtea-2.5.4pre03
 ca26767d3375a7870ca942236c33653dbb7ceacc icedtea-2.5.4
+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
+e8ab19435208726b1334ba8e7928ea154e0959b3 jdk7u72-b30
+d8246774af472f617033202d2c58c7572da08dcd jdk7u72-b31
+4173f90038ff1764576d08efa34109a7895f106b jdk7u75-b00
+b9eaa7d194dd5e23bd2d53be4d57b25fdcb08e31 jdk7u75-b01
+98eaae4f301779861be3f9a8b0854ec83074615a jdk7u75-b02
+eb57739c7818a0dbaa39122ad35f5e48584be5df jdk7u75-b03
+908a056c8d8fa65864cbf5745a050f675be35288 jdk7u75-b04
+079579b6672777d71624b49b29042cd19cbccef2 jdk7u75-b05
+967717c26bb17ff3c3aa399072eebed17c599a92 jdk7u75-b06
+1a9565415e4142f9914b309888056f9b8f27de97 jdk7u75-b07
+d8419be679448402af177510f1a154ca7935d24f jdk7u75-b08
+08599c76e606df8d369d1eda03ac876ffbaafb36 jdk7u75-b09
+d3c566dedbcde177bfa573ae3632ad21c335a03d jdk7u75-b10
+1d6f8fbbfefc63adde96d70d74dc281616b7ac01 jdk7u75-b11
+15f65800816f164b5855744b59fbc3d661e0511d jdk7u75-b12
+d6c90cc2e91d58688884a8e659e79603e37d4cd5 jdk7u75-b13
+999eb9cbf8404232a03e3a877680ca3541b8f62c jdk7u75-b30
diff -r 4809b329ad87 -r 91f042201bb6 src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java
--- a/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java	Wed Jan 21 03:56:40 2015 +0000
+++ b/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java	Tue Jan 27 00:46:11 2015 +0000
@@ -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(){