Mailing-List: contact axis-dev-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: axis-dev@xml.apache.org
Date: 6 Dec 2001 16:55:43 -0000
Message-ID: <20011206165543.26885.qmail@icarus.apache.org>
From: gdaniels@apache.org
To: xml-axis-cvs@apache.org
Subject: cvs commit: xml-axis/java/src/org/apache/axis/deployment/wsdd
 WSDDDeployableItem.java WSDDChain.java

gdaniels    01/12/06 08:55:43

  Modified:    java/src/org/apache/axis/deployment/wsdd
                        WSDDDeployableItem.java WSDDChain.java
  Log:
  Correctly propagate exceptions upwards...
  
  Revision  Changes    Path
  1.21      +12 -17    xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java
  
  Index: WSDDDeployableItem.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- WSDDDeployableItem.java	2001/11/25 19:11:59	1.20
  +++ WSDDDeployableItem.java	2001/12/06 16:55:43	1.21
  @@ -310,25 +310,20 @@
       protected Handler makeNewInstance(DeploymentRegistry registry)
           throws Exception
       {
  -        try {
  -            Class   c = getJavaClass();
  -            Handler h = null;
  -
  -            if (c != null) {
  -                h = (Handler)createInstance(c);
  -
  -                if (h != null) {
  -                    h.setOptions(getParametersTable());
  -                }
  -            } else {
  -                h = registry.getHandler(getType());
  +        Class   c = getJavaClass();
  +        Handler h = null;
  +        
  +        if (c != null) {
  +            h = (Handler)createInstance(c);
  +            
  +            if (h != null) {
  +                h.setOptions(getParametersTable());
               }
  -
  -            return h;
  +        } else {
  +            h = registry.getHandler(getType());
           }
  -        catch (Exception e) {
  -            throw e;
  -        }
  +        
  +        return h;
       }
   
       /**
  
  
  
  1.20      +7 -12     xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDChain.java
  
  Index: WSDDChain.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDChain.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- WSDDChain.java	2001/11/14 17:26:18	1.19
  +++ WSDDChain.java	2001/12/06 16:55:43	1.20
  @@ -163,19 +163,14 @@
       public Handler makeNewInstance(DeploymentRegistry registry)
           throws Exception
       {
  -        try {
  -            Chain         c        = new org.apache.axis.SimpleChain();
  -
  -            for (int n = 0; n < handlers.size(); n++) {
  -                WSDDHandler handler = (WSDDHandler)handlers.get(n); 
  -                c.addHandler(handler.getInstance(registry));
  -            }
  -
  -            return c;
  +        Chain         c        = new org.apache.axis.SimpleChain();
  +        
  +        for (int n = 0; n < handlers.size(); n++) {
  +            WSDDHandler handler = (WSDDHandler)handlers.get(n); 
  +            c.addHandler(handler.getInstance(registry));
           }
  -        catch (Exception e) {
  -            return null;
  -        }
  +        
  +        return c;
       }
       
       /**