axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject cvs commit: xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap SOAPJMSConnection.java
Date Thu, 20 Jun 2002 14:49:21 GMT
antelder    2002/06/20 07:49:21

  Modified:    java/src/org/apache/wsif/providers/soap/apacheaxis
                        WSIFJmsSender.java
               java/src/org/apache/wsif/providers/soap/apachesoap
                        SOAPJMSConnection.java
  Log:
  Fix defect 135663 - For async operations SOAP and Axis providers should store the WSIFOperation
in the correlation service regardless of if there is a response handler defined
  
  Revision  Changes    Path
  1.2       +7 -10     xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFJmsSender.java
  
  Index: WSIFJmsSender.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFJmsSender.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WSIFJmsSender.java	6 Jun 2002 08:28:51 -0000	1.1
  +++ WSIFJmsSender.java	20 Jun 2002 14:49:20 -0000	1.2
  @@ -131,16 +131,13 @@
               (WSIFOperation_ApacheAxis) messageContext.getProperty(
                   WSIFJmsTransport.WSIFOPERATION);
   
  -        if (wsifOp.getResponseHandler() == null) {
  -            msgID = dest.send(data);
  -        } else {
  -            WSIFCorrelationService correlator =
  -                WSIFCorrelationServiceLocator.getCorrelationService();
  -            synchronized (correlator) {
  -                msgID = dest.send(data);
  -                WSIFCorrelationId cid = new WSIFJMSCorrelationId(msgID);
  -                correlator.put(cid, (Serializable) wsifOp, ASYNC_TIMEOUT);
  -            }
  +       WSIFCorrelationService correlator =
  +          WSIFCorrelationServiceLocator.getCorrelationService();
  +          
  +       synchronized( correlator ) {   
  +          msgID = dest.send( data );
  +          WSIFCorrelationId cid = new WSIFJMSCorrelationId( msgID );
  +          correlator.put( cid, (Serializable)wsifOp, ASYNC_TIMEOUT );
           }
   
           // Save msg ID in the WSIFop for this calling client
  
  
  
  1.4       +9 -11     xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/SOAPJMSConnection.java
  
  Index: SOAPJMSConnection.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apachesoap/SOAPJMSConnection.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SOAPJMSConnection.java	12 Jun 2002 15:35:38 -0000	1.3
  +++ SOAPJMSConnection.java	20 Jun 2002 14:49:21 -0000	1.4
  @@ -186,18 +186,16 @@
           env.marshall(payloadSW, smr, ctx);
           WSIFOperation_ApacheSOAP wsifOp = (WSIFOperation_ApacheSOAP) getWsifOperation();
   
  -        if (wsifOp.getResponseHandler() == null) {
  +        WSIFCorrelationService correlator =
  +           WSIFCorrelationServiceLocator.getCorrelationService();
  +           
  +        synchronized( correlator ) {   
               msgID = destination.send(payloadSW.toString(), null);
  -        } else {
  -            destination.setAsyncMode(true);
  -            WSIFCorrelationService correlator =
  -                WSIFCorrelationServiceLocator.getCorrelationService();
  -            synchronized (correlator) {
  -                msgID = destination.send(payloadSW.toString(), null);
  -                WSIFCorrelationId cid = new WSIFJMSCorrelationId(msgID);
  -                correlator.put(cid, (Serializable) getWsifOperation(), ASYNC_TIMEOUT);
  -            }
  -            destination.setAsyncMode(false);
  +            WSIFCorrelationId cid = new WSIFJMSCorrelationId( msgID );
  +            correlator.put( 
  +               cid,
  +               (Serializable)getWsifOperation(),
  +               ASYNC_TIMEOUT );
           }
   
           wsifOp.setAsyncRequestID(new WSIFJMSCorrelationId(msgID));
  
  
  

Mime
View raw message