Mercurial > hg > release > icedtea7-forest-2.4 > jaxp

changeset 741:2e6d1ceda5ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Wed, 10 Jul 2013 17:07:02 -0700
parents 7548ce6c26ac (current diff) b6590dd14864 (diff)
children 399c58bf22ad
files .hgtags
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jul 10 17:02:07 2013 -0700
+++ b/.hgtags	Wed Jul 10 17:07:02 2013 -0700
@@ -342,5 +342,6 @@
 09b080236bc1a1a68f8b411196cbfa52475c0755 jdk7u40-b30
 5b31380e2e0b6f8386dcf0ca122461154f2d2704 jdk7u40-b31
 75bb397c4ae26c384e1fcb75bbf4b70479f2c5f7 jdk7u40-b32
+ce771024e07d2bb6521735a14ce68745a2376bd8 jdk7u40-b33
 1a7e2024963d3a8d6cde209de0967ac43418b82a jdk7u45-b01
 72b314bf2ee171bec2157f737ba3bf77fbdf1118 jdk7u45-b02
--- a/src/org/xml/sax/helpers/XMLReaderFactory.java	Wed Jul 10 17:02:07 2013 -0700
+++ b/src/org/xml/sax/helpers/XMLReaderFactory.java	Wed Jul 10 17:07:02 2013 -0700
@@ -85,6 +85,7 @@
     private static final String property = "org.xml.sax.driver";
     private static SecuritySupport ss = new SecuritySupport();
 
+    private static String _clsFromJar = null;
     private static boolean _jarread = false;
     /**
      * Attempt to create an XMLReader from system defaults.
@@ -163,14 +164,14 @@
                     }
 
                     if (in != null) {
-                        reader = new BufferedReader (
-                                new InputStreamReader (in, "UTF8"));
-                        className = reader.readLine ();
+                        reader = new BufferedReader (new InputStreamReader (in, "UTF8"));
+                        _clsFromJar = reader.readLine ();
                         in.close ();
                     }
                 } catch (Exception e) {
                 }
             }
+            className = _clsFromJar;
         }
 
         // 3. Distro-specific fallback