From d84a3ea853f81450baaea44e06fd4ddc613ed5e7 Mon Sep 17 00:00:00 2001 From: edwingo Date: Wed, 24 Oct 2001 00:55:15 +0000 Subject: [PATCH] Fixed bug in reflection code so code will compile and run on JDK 1.1 git-svn-id: https://svn.apache.org/repos/asf/xml/commons/trunk@225928 13f79535-47bb-0310-9956-ffa450edef68 --- java/external/src/javax/xml/parsers/FactoryFinder.java | 7 ++----- java/external/src/javax/xml/transform/FactoryFinder.java | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/java/external/src/javax/xml/parsers/FactoryFinder.java b/java/external/src/javax/xml/parsers/FactoryFinder.java index cce4410..423c204 100644 --- a/java/external/src/javax/xml/parsers/FactoryFinder.java +++ b/java/external/src/javax/xml/parsers/FactoryFinder.java @@ -102,7 +102,6 @@ class FactoryFinder { private static ClassLoader findClassLoader() throws ConfigurationError { - ClassLoader classLoader; Method m = null; try { @@ -112,11 +111,11 @@ class FactoryFinder { if (debug) { debugPrintln("assuming JDK 1.1"); } - classLoader = FactoryFinder.class.getClassLoader(); + return FactoryFinder.class.getClassLoader(); } try { - classLoader = (ClassLoader) m.invoke(Thread.currentThread(), null); + return (ClassLoader) m.invoke(Thread.currentThread(), null); } catch (IllegalAccessException e) { // assert(false) throw new ConfigurationError("Unexpected IllegalAccessException", @@ -126,8 +125,6 @@ class FactoryFinder { throw new ConfigurationError("Unexpected InvocationTargetException", e); } - - return classLoader; } /** diff --git a/java/external/src/javax/xml/transform/FactoryFinder.java b/java/external/src/javax/xml/transform/FactoryFinder.java index 98e3847..0b579e1 100644 --- a/java/external/src/javax/xml/transform/FactoryFinder.java +++ b/java/external/src/javax/xml/transform/FactoryFinder.java @@ -102,7 +102,6 @@ class FactoryFinder { private static ClassLoader findClassLoader() throws ConfigurationError { - ClassLoader classLoader; Method m = null; try { @@ -112,11 +111,11 @@ class FactoryFinder { if (debug) { debugPrintln("assuming JDK 1.1"); } - classLoader = FactoryFinder.class.getClassLoader(); + return FactoryFinder.class.getClassLoader(); } try { - classLoader = (ClassLoader) m.invoke(Thread.currentThread(), null); + return (ClassLoader) m.invoke(Thread.currentThread(), null); } catch (IllegalAccessException e) { // assert(false) throw new ConfigurationError("Unexpected IllegalAccessException", @@ -126,8 +125,6 @@ class FactoryFinder { throw new ConfigurationError("Unexpected InvocationTargetException", e); } - - return classLoader; } /**