|
From: <hib...@li...> - 2006-07-12 15:40:25
|
Author: ste...@jb...
Date: 2006-07-12 11:39:59 -0400 (Wed, 12 Jul 2006)
New Revision: 10109
Modified:
trunk/Hibernate3/src/org/hibernate/util/ReflectHelper.java
Log:
HHH-1898 and other cleanup
Modified: trunk/Hibernate3/src/org/hibernate/util/ReflectHelper.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/util/ReflectHelper.java 2006-07-12 15:31:11 UTC (rev 10108)
+++ trunk/Hibernate3/src/org/hibernate/util/ReflectHelper.java 2006-07-12 15:39:59 UTC (rev 10109)
@@ -91,31 +91,25 @@
public static Class classForName(String name) throws ClassNotFoundException {
try {
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- if (contextClassLoader!=null) {
+ if ( contextClassLoader != null ) {
return contextClassLoader.loadClass(name);
- }
- else {
- return Class.forName(name);
}
}
- catch (Exception e) {
- return Class.forName(name);
+ catch ( Throwable t ) {
}
+ return Class.forName( name );
}
public static Class classForName(String name, Class caller) throws ClassNotFoundException {
try {
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- if (contextClassLoader!=null) {
- return contextClassLoader.loadClass(name);
+ if ( contextClassLoader != null ) {
+ return contextClassLoader.loadClass( name );
}
- else {
- return Class.forName( name, true, caller.getClassLoader() );
- }
}
- catch (Exception e) {
- return Class.forName( name, true, caller.getClassLoader() );
+ catch ( Throwable e ) {
}
+ return Class.forName( name, true, caller.getClassLoader() );
}
public static boolean isPublic(Class clazz, Member member) {
@@ -125,15 +119,15 @@
public static Object getConstantValue(String name) {
Class clazz;
try {
- clazz = classForName( StringHelper.qualifier(name) );
+ clazz = classForName( StringHelper.qualifier( name ) );
}
- catch(Exception cnfe) {
+ catch ( Throwable t ) {
return null;
}
try {
- return clazz.getField( StringHelper.unqualify(name) ).get(null);
+ return clazz.getField( StringHelper.unqualify( name ) ).get(null);
}
- catch (Exception e) {
+ catch ( Throwable t ) {
return null;
}
}
|