changeset 685:ce771024e07d jdk7u40-b33

Merge
author lana
date Thu, 04 Jul 2013 10:31:11 -0700
parents 06851832b1bb (current diff) 5ede168e9229 (diff)
children b6590dd14864 4149e4abea17
files
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/org/xml/sax/helpers/XMLReaderFactory.java	Wed Jul 03 16:36:34 2013 -0700
+++ b/src/org/xml/sax/helpers/XMLReaderFactory.java	Thu Jul 04 10:31:11 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