Merge in a fix from the tck-jaxp-1_2_0 branch:

The reader used to read the service provider is never
closed if an IOException is thrown while reading from
it. Adding a finally block so that the reader will
always be closed.


git-svn-id: https://svn.apache.org/repos/asf/xml/commons/trunk@226238 13f79535-47bb-0310-9956-ffa450edef68

java/external/src/javax/xml/datatype/FactoryFinder.java

@@ -292,11 +292,19 @@ class FactoryFinder {
             // XXX Does not handle all possible input as specified by the
             // Jar Service Provider specification
             factoryClassName = rd.readLine();
-            rd.close();
+        } 
-        } catch (IOException x) {
+        catch (IOException x) {
             // No provider found
             return null;
         }
+        finally {
+            try { 
+                // try to close the reader. 
+                rd.close(); 
+            } 
+            // Ignore the exception. 
+            catch (IOException exc) {}
+        }
 
         if (factoryClassName != null &&
             ! "".equals(factoryClassName)) {

java/external/src/javax/xml/parsers/FactoryFinder.java

@@ -275,11 +275,19 @@ class FactoryFinder {
             // XXX Does not handle all possible input as specified by the
             // Jar Service Provider specification
             factoryClassName = rd.readLine();
-            rd.close();
+        } 
-        } catch (IOException x) {
+        catch (IOException x) {
             // No provider found
             return null;
         }
+        finally {
+            try { 
+                // try to close the reader. 
+                rd.close(); 
+            } 
+            // Ignore the exception. 
+            catch (IOException exc) {}
+        }
 
         if (factoryClassName != null &&
             ! "".equals(factoryClassName)) {

java/external/src/javax/xml/transform/FactoryFinder.java

@@ -275,11 +275,19 @@ class FactoryFinder {
             // XXX Does not handle all possible input as specified by the
             // Jar Service Provider specification
             factoryClassName = rd.readLine();
-            rd.close();
+        } 
-        } catch (IOException x) {
+        catch (IOException x) {
             // No provider found
             return null;
         }
+        finally {
+            try { 
+                // try to close the reader. 
+                rd.close(); 
+            } 
+            // Ignore the exception. 
+            catch (IOException exc) {}
+        }
 
         if (factoryClassName != null &&
             ! "".equals(factoryClassName)) {