Merge
authorchegar
Tue, 18 Jun 2013 09:36:20 +0100
changeset 18367 f70f77888ae0
parent 18366 e3ce5f5451a1 (current diff)
parent 18358 6a0e9fd8f727 (diff)
child 18368 7e597f886360
Merge
--- a/jaxp/src/org/xml/sax/helpers/XMLReaderFactory.java	Mon Jun 17 11:18:50 2013 +0100
+++ b/jaxp/src/org/xml/sax/helpers/XMLReaderFactory.java	Tue Jun 18 09:36:20 2013 +0100
@@ -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