Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 11784 invoked from network); 10 May 2004 20:51:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 10 May 2004 20:51:56 -0000 Received: (qmail 49825 invoked by uid 500); 10 May 2004 20:41:52 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 43564 invoked by uid 500); 10 May 2004 20:40:14 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 38651 invoked by uid 98); 10 May 2004 20:39:13 -0000 Received: from gawor@apache.org by hermes.apache.org by uid 82 with qmail-scanner-1.20 (clamuko: 0.70. Clear:RC:0(209.237.227.194):. Processed in 1.522952 secs); 10 May 2004 20:39:12 -0000 X-Qmail-Scanner-Mail-From: gawor@apache.org via hermes.apache.org X-Qmail-Scanner: 1.20 (Clear:RC:0(209.237.227.194):. Processed in 1.522952 secs) Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by hermes.apache.org with SMTP; 10 May 2004 20:39:09 -0000 Received: (qmail 94910 invoked by uid 1845); 10 May 2004 20:21:29 -0000 Date: 10 May 2004 20:21:29 -0000 Message-ID: <20040510202129.94909.qmail@minotaur.apache.org> From: gawor@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/java/src/org/apache/axis/client ServiceFactory.java X-Spam-Rating: hermes.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N gawor 2004/05/10 13:21:29 Modified: java/src/org/apache/axis/client ServiceFactory.java Log: unnecessary wrapping of ServiceExceptions Revision Changes Path 1.26 +5 -3 ws-axis/java/src/org/apache/axis/client/ServiceFactory.java Index: ServiceFactory.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/client/ServiceFactory.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ServiceFactory.java 10 May 2004 17:18:55 -0000 1.25 +++ ServiceFactory.java 10 May 2004 20:21:29 -0000 1.26 @@ -299,10 +299,10 @@ } private Service createService(String serviceImplementationName) throws ServiceException { + if(serviceImplementationName == null) { + throw new IllegalArgumentException(Messages.getMessage("serviceFactoryInvalidServiceName")); + } try { - if(serviceImplementationName == null) { - throw new IllegalArgumentException(Messages.getMessage("serviceFactoryInvalidServiceName")); - } Class serviceImplementationClass; serviceImplementationClass = Thread.currentThread().getContextClassLoader().loadClass(serviceImplementationName); if (!(org.apache.axis.client.Service.class).isAssignableFrom(serviceImplementationClass)) { @@ -315,6 +315,8 @@ } else { throw new ServiceException(Messages.getMessage("serviceFactoryInvalidServiceName")); } + } catch (ServiceException e) { + throw e; } catch (Exception e){ throw new ServiceException(e); }