Author: kkolinko
Date: Tue May 20 11:59:12 2014
New Revision: 1596217
URL: http://svn.apache.org/r1596217
Log:
Further simplify the code
Merge two try/catch inside two branches of if/else.
factoryClass cannot be null after loadClass()/Class.forName() calls.
Modified:
tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
Modified: tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java?rev=1596217&r1=1596216&r2=1596217&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java Tue May 20
11:59:12 2014
@@ -56,37 +56,28 @@ public abstract class FactoryBase implem
// Loading factory
ClassLoader tcl =
Thread.currentThread().getContextClassLoader();
Class<?> factoryClass = null;
- if (tcl != null) {
- try {
+ try {
+ if (tcl != null) {
factoryClass = tcl.loadClass(factoryClassName);
- } catch(ClassNotFoundException e) {
- NamingException ex = new NamingException(
- "Could not load resource factory class");
- ex.initCause(e);
- throw ex;
- }
- } else {
- try {
+ } else {
factoryClass = Class.forName(factoryClassName);
- } catch(ClassNotFoundException e) {
- NamingException ex = new NamingException(
- "Could not load resource factory class");
- ex.initCause(e);
- throw ex;
}
+ } catch(ClassNotFoundException e) {
+ NamingException ex = new NamingException(
+ "Could not load resource factory class");
+ ex.initCause(e);
+ throw ex;
}
- if (factoryClass != null) {
- try {
- factory = (ObjectFactory) factoryClass.newInstance();
- } catch(Throwable t) {
- if (t instanceof NamingException) {
- throw (NamingException) t;
- }
- NamingException ex = new NamingException(
- "Could not create resource factory instance");
- ex.initCause(t);
- throw ex;
+ try {
+ factory = (ObjectFactory) factoryClass.newInstance();
+ } catch(Throwable t) {
+ if (t instanceof NamingException) {
+ throw (NamingException) t;
}
+ NamingException ex = new NamingException(
+ "Could not create resource factory instance");
+ ex.initCause(t);
+ throw ex;
}
} else {
// Check for a default factory
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
