Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 88165 invoked from network); 7 Feb 2006 17:55:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 7 Feb 2006 17:55:49 -0000 Received: (qmail 24967 invoked by uid 500); 7 Feb 2006 17:55:40 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 24925 invoked by uid 500); 7 Feb 2006 17:55:39 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 24913 invoked by uid 500); 7 Feb 2006 17:55:39 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 24910 invoked by uid 99); 7 Feb 2006 17:55:39 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Feb 2006 09:55:39 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 07 Feb 2006 09:55:38 -0800 Received: (qmail 87796 invoked by uid 65534); 7 Feb 2006 17:55:17 -0000 Message-ID: <20060207175517.87793.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r375650 - in /tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory: EjbFactory.java ResourceEnvFactory.java ResourceFactory.java TransactionFactory.java Date: Tue, 07 Feb 2006 17:55:13 -0000 To: tomcat-dev@jakarta.apache.org From: remm@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: remm Date: Tue Feb 7 09:55:11 2006 New Revision: 375650 URL: http://svn.apache.org/viewcvs?rev=375650&view=rev Log: - More detailed error report using exception nesting. Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/EjbFactory.java tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/ResourceEnvFactory.java tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/ResourceFactory.java tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/TransactionFactory.java Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/EjbFactory.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/EjbFactory.java?rev=375650&r1=375649&r2=375650&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/EjbFactory.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/EjbFactory.java Tue Feb 7 09:55:11 2006 @@ -114,11 +114,19 @@ try { factoryClass = tcl.loadClass(factoryClassName); } catch(ClassNotFoundException e) { + NamingException ex = new NamingException + ("Could not load resource factory class"); + ex.initCause(e); + throw ex; } } else { try { factoryClass = Class.forName(factoryClassName); } catch(ClassNotFoundException e) { + NamingException ex = new NamingException + ("Could not load resource factory class"); + ex.initCause(e); + throw ex; } } if (factoryClass != null) { @@ -135,6 +143,12 @@ factory = (ObjectFactory) Class.forName(javaxEjbFactoryClassName).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; } } Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/ResourceEnvFactory.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/ResourceEnvFactory.java?rev=375650&r1=375649&r2=375650&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/ResourceEnvFactory.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/ResourceEnvFactory.java Tue Feb 7 09:55:11 2006 @@ -77,17 +77,31 @@ try { factoryClass = tcl.loadClass(factoryClassName); } catch(ClassNotFoundException e) { + NamingException ex = new NamingException + ("Could not load resource factory class"); + ex.initCause(e); + throw ex; } } else { try { factoryClass = Class.forName(factoryClassName); } 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; } } } Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/ResourceFactory.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/ResourceFactory.java?rev=375650&r1=375649&r2=375650&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/ResourceFactory.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/ResourceFactory.java Tue Feb 7 09:55:11 2006 @@ -77,28 +77,31 @@ try { factoryClass = tcl.loadClass(factoryClassName); } catch(ClassNotFoundException e) { - throw new NamingException( - "Could not create resource factory, ClassNotFoundException:" + - e.getMessage()); + NamingException ex = new NamingException + ("Could not load resource factory class"); + ex.initCause(e); + throw ex; } } else { try { factoryClass = Class.forName(factoryClassName); } catch(ClassNotFoundException e) { - throw new NamingException( - "Could not create resource factory, ClassNotFoundException:" + - e.getMessage()); + 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; - throw new NamingException( - "Could not create resource factory instance, " + - t.getMessage()); + } 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 { @@ -110,8 +113,11 @@ factory = (ObjectFactory) Class.forName(javaxSqlDataSourceFactoryClassName) .newInstance(); - } catch(Throwable t) { - + } catch (Throwable t) { + NamingException ex = new NamingException + ("Could not create resource factory instance"); + ex.initCause(t); + throw ex; } } else if (ref.getClassName().equals("javax.mail.Session")) { String javaxMailSessionFactoryClassName = @@ -122,6 +128,10 @@ Class.forName(javaxMailSessionFactoryClassName) .newInstance(); } catch(Throwable t) { + NamingException ex = new NamingException + ("Could not create resource factory instance"); + ex.initCause(t); + throw ex; } } } Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/TransactionFactory.java URL: http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/TransactionFactory.java?rev=375650&r1=375649&r2=375650&view=diff ============================================================================== --- tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/TransactionFactory.java (original) +++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/naming/factory/TransactionFactory.java Tue Feb 7 09:55:11 2006 @@ -77,17 +77,31 @@ try { factoryClass = tcl.loadClass(factoryClassName); } catch(ClassNotFoundException e) { + NamingException ex = new NamingException + ("Could not load resource factory class"); + ex.initCause(e); + throw ex; } } else { try { factoryClass = Class.forName(factoryClassName); } 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; } } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org