cvs commit: xml-axis/java/src/org/apache/axis/providers/java JavaProvider.java

[rsitze]

rsitze      2002/09/25 13:16:05

  Modified:    java/src/org/apache/axis/providers/java JavaProvider.java
  Log:
  Ensure that we cleanup proper scope...
  
  Revision  Changes    Path
  1.81      +20 -18    
xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java
  
  Index: JavaProvider.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- JavaProvider.java 18 Sep 2002 16:10:33 -0000      1.80
  +++ JavaProvider.java 25 Sep 2002 20:16:05 -0000      1.81
  @@ -259,25 +259,27 @@
                                                    clsName,
                                                    scope);
   
  -            Message        reqMsg  = msgContext.getRequestMessage();
  -            SOAPEnvelope   reqEnv  = (SOAPEnvelope)reqMsg.getSOAPEnvelope();
  -            Message        resMsg  = msgContext.getResponseMessage();
  -            SOAPEnvelope   resEnv  = (resMsg == null) ?
  -                                     new SOAPEnvelope(msgContext.
  -                                                        getSOAPConstants()) :
  -                                     (SOAPEnvelope)resMsg.getSOAPEnvelope();
  -
  -            // If we didn't have a response message, make sure we set one up
  -            if (resMsg == null) {
  -                resMsg = new Message(resEnv);
  -                msgContext.setResponseMessage( resMsg );
  -            }
  -
               try {
  -                processMessage(msgContext, reqEnv,
  -                               resEnv, obj);
  -            } catch (Exception exp) {
  -                throw exp;
  +                Message        reqMsg  = msgContext.getRequestMessage();
  +                SOAPEnvelope   reqEnv  = (SOAPEnvelope)reqMsg.getSOAPEnvelope();
  +                Message        resMsg  = msgContext.getResponseMessage();
  +                SOAPEnvelope   resEnv  = (resMsg == null) ?
  +                                         new SOAPEnvelope(msgContext.
  +                                                            getSOAPConstants()) :
  +                                         (SOAPEnvelope)resMsg.getSOAPEnvelope();
  +    
  +                // If we didn't have a response message, make sure we set one up
  +                if (resMsg == null) {
  +                    resMsg = new Message(resEnv);
  +                    msgContext.setResponseMessage( resMsg );
  +                }
  +    
  +                try {
  +                    processMessage(msgContext, reqEnv,
  +                                   resEnv, obj);
  +                } catch (Exception exp) {
  +                    throw exp;
  +                }
               } finally {
                   // If this is a request scoped service object which implements
                   // ServiceLifecycle, let it know that it's being destroyed now.