Mercurial > hg > icedtea7-forest > jaxp

changeset 1263:920ef60f5a96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Tue, 14 Oct 2014 12:18:38 -0700
parents ae237494eb0e (current diff) f94b9a2d314b (diff)
children 2c9bbf420bc1
files .hgtags
diffstat 4 files changed, 17 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Oct 14 10:33:31 2014 -0700
+++ b/.hgtags	Tue Oct 14 12:18:38 2014 -0700
@@ -473,6 +473,9 @@
 45db678253587755df4a00066e42e2fce04bbb71 jdk7u65-b18
 4e323af07c47061109fb5f585613b0cc4b4208ca jdk7u65-b19
 f3b7bb6f1924ab7f635cdd60db7fbab64576cd6d jdk7u65-b32
+7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u80-b00
+4c959b6a32057ec18c9c722ada3d0d0c716a51c4 jdk7u80-b01
+25a1b88d7a473e067471e00a5457236736e9a2e0 jdk7u80-b02
 d41f31b707c87675f3467e980b1ceef2e53b3b5d jdk7u65-b20
 d1f8566d39c56e40516a1afb304ed7c0681355d8 jdk7u67-b01
 4e323af07c47061109fb5f585613b0cc4b4208ca jdk7u65-b40
@@ -528,5 +531,11 @@
 b9eaa7d194dd5e23bd2d53be4d57b25fdcb08e31 jdk7u75-b01
 98eaae4f301779861be3f9a8b0854ec83074615a jdk7u75-b02
 eb57739c7818a0dbaa39122ad35f5e48584be5df jdk7u75-b03
+908a056c8d8fa65864cbf5745a050f675be35288 jdk7u75-b04
+8405eb3c02e3f81b20faa1adf43d447e2e7b7705 jdk7u76-b00
+f478245e2c18bd459d085c70cf7aa212b1f30dbf jdk7u76-b01
+bb77b08b760634a87ee3c1fbb3c7a519d61d4e87 jdk7u76-b02
+0c337b6088029d8867732a2f1e08dcc7271e6111 jdk7u76-b03
+0d0d6c0a1ae3cae89f59491c6643fe7f12c497bc jdk7u76-b04
 908a056c8d8fa65864cbf5745a050f675be35288 jdk7u79-b00
-1ef977b9cde1fd431b8629ca8da4bd719081802f jdk7u75-b04
+
--- a/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Tue Oct 14 10:33:31 2014 -0700
+++ b/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java	Tue Oct 14 12:18:38 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	Tue Oct 14 10:33:31 2014 -0700
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Tue Oct 14 12:18:38 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	Tue Oct 14 10:33:31 2014 -0700
+++ b/src/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java	Tue Oct 14 12:18:38 2014 -0700
@@ -851,7 +851,6 @@
                 ser.fDOMErrorHandler.handleError(error);
 
             }
-            e.printStackTrace();
             throw (LSException) DOMUtil.createLSException(LSException.SERIALIZE_ERR, e).fillInStackTrace();
         }
         return true;