cvs commit: xml-axis/java/src/org/apache/axis/handlers/soap SOAPService.java

[dims]

dims        2003/03/10 06:31:48

  Modified:    java/src/org/apache/axis/handlers/soap SOAPService.java
  Log:
  Fix for Bug 15478 - Current Handler implementation doesn't follow the JAX-RPC ver 1.0
  from [EMAIL PROTECTED] (Toshiyuki Kimura)
  
  Revision  Changes    Path
  1.94      +12 -5     xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java
  
  Index: SOAPService.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- SOAPService.java  24 Feb 2003 19:47:56 -0000      1.93
  +++ SOAPService.java  10 Mar 2003 14:31:48 -0000      1.94
  @@ -470,13 +470,20 @@
           HandlerInfoChainFactory handlerFactory = (HandlerInfoChainFactory) 
this.getOption(Constants.ATTR_HANDLERINFOCHAIN);
           HandlerChainImpl handlerImpl = null;
           if (handlerFactory != null) handlerImpl = (HandlerChainImpl) 
handlerFactory.createHandlerChain();
  -        if (handlerImpl != null) handlerImpl.handleRequest(msgContext);
  -
  -        super.invoke(msgContext);
  -
  +        boolean result = true;
  +        
  +        if (handlerImpl != null) {
  +            result = handlerImpl.handleRequest(msgContext);
  +        }
  +        if (result) {
  +            super.invoke(msgContext);
  +        } else {
  +            msgContext.setPastPivot(true);
  +        }
  + 
           if ( handlerImpl != null) {
               handlerImpl.handleResponse(msgContext);
  -                handlerImpl.destroy();
  +            handlerImpl.destroy();
           }
       }
   }