Mercurial > hg > icedtea7-forest-aarch64 > jaxp

changeset 1160:1853995499ce jdk7u80-b03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Tue, 07 Oct 2014 12:50:53 -0700
parents 0b24c5b0f211 (diff) 3aad34623301 (current diff)
children f59ee5163710 d21a5188bf59
files .hgtags
diffstat 4 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Oct 06 11:17:55 2014 -0700
+++ b/.hgtags	Tue Oct 07 12:50:53 2014 -0700
@@ -519,3 +519,6 @@
 8f0d267ca63ab2f9d7839604ae88fafbcc0ad2d4 jdk7u72-b13
 fec38133453a8d70d4c528595ae1cab47909c4bd jdk7u72-b14
 e8ab19435208726b1334ba8e7928ea154e0959b3 jdk7u72-b30
+7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u80-b00
+4c959b6a32057ec18c9c722ada3d0d0c716a51c4 jdk7u80-b01
+25a1b88d7a473e067471e00a5457236736e9a2e0 jdk7u80-b02
--- a/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Mon Oct 06 11:17:55 2014 -0700
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Tue Oct 07 12:50:53 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 Oct 06 11:17:55 2014 -0700
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Tue Oct 07 12:50:53 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 Oct 06 11:17:55 2014 -0700
+++ b/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java	Tue Oct 07 12:50:53 2014 -0700
@@ -851,7 +851,6 @@
                 ser.fDOMErrorHandler.handleError(error);
 
             }
-            e.printStackTrace();
             throw (LSException) DOMUtil.createLSException(LSException.SERIALIZE_ERR, e).fillInStackTrace();
         }
         return true;