Mercurial > hg > icedtea7-forest-aarch64 > jaxp

changeset 1148:90b8e5b32e58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Thu, 28 Aug 2014 15:04:09 -0700
parents 498ddd5ee22c (diff) 0cce3514fa18 (current diff)
children 0b24c5b0f211
files .hgtags
diffstat 4 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 25 15:58:09 2014 -0700
+++ b/.hgtags	Thu Aug 28 15:04:09 2014 -0700
@@ -512,3 +512,6 @@
 7637d4b21a9e3237f129f69a0dc7132877f3ab19 jdk7u72-b09
 a3d6d3327b32cd7fb41a144d48f957170dde3ba8 jdk7u72-b10
 d3fbd111daa01dc1737afd0a59084e14664d581a jdk7u72-b11
+7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u80-b00
+4c959b6a32057ec18c9c722ada3d0d0c716a51c4 jdk7u80-b01
+25a1b88d7a473e067471e00a5457236736e9a2e0 jdk7u80-b02
--- a/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Mon Aug 25 15:58:09 2014 -0700
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Thu Aug 28 15:04:09 2014 -0700
@@ -450,7 +450,8 @@
     }
 
     private void propagateFeatures(AbstractXMLSchema schema) {
-        schema.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, fSecurityManager != null);
+        schema.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
+                (fSecurityManager != null && fSecurityManager.isSecureProcessing()));
         schema.setFeature(Constants.ORACLE_FEATURE_SERVICE_MECHANISM, fUseServicesMechanism);
         String[] features = fXMLSchemaLoader.getRecognizedFeatures();
         for (int i = 0; i < features.length; ++i) {
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Mon Aug 25 15:58:09 2014 -0700
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Thu Aug 28 15:04:09 2014 -0700
@@ -3145,7 +3145,11 @@
                                   m_data.elementAt(-dataIndex+1));
       }
     }
-    else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type
+    else if (DTM.ELEMENT_NODE == type)
+    {
+      return getStringValueX(nodeHandle);
+    }
+    else if (DTM.DOCUMENT_FRAGMENT_NODE == type
              || DTM.DOCUMENT_NODE == type)
     {
       return null;
--- a/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java	Mon Aug 25 15:58:09 2014 -0700
+++ b/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java	Thu Aug 28 15:04:09 2014 -0700
@@ -851,7 +851,6 @@
                 ser.fDOMErrorHandler.handleError(error);
 
             }
-            e.printStackTrace();
             throw (LSException) DOMUtil.createLSException(LSException.SERIALIZE_ERR, e).fillInStackTrace();
         }
         return true;