axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bill Nagy <n...@watson.ibm.com>
Subject [Axis2] Re: svn commit: r501805 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java
Date Thu, 01 Feb 2007 13:54:49 GMT
Can we please come to an agreement to fix a single issue in a commit and
not to make unrelated formatting or other changes at the same time?  It
makes it much more difficult to figure out what has been done if you do
that.  (Note that I'm not saying that multiple things can't change if
they are related to the same issue/feature, just that we should try to
eliminate irrelevant changes within the same commit.)  Thanks.

-Bill

On Wed, 2007-01-31 at 11:32 +0000, deepal@apache.org wrote:
> Author: deepal
> Date: Wed Jan 31 03:32:17 2007
> New Revision: 501805
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=501805
> Log:
> fixing 1857
>  - rather than just keeping parent option object inside opclient ,
> changed to create new option putting parent option as parent.
> 
> Modified:
> 
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java
> 
> Modified:
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java
> URL:
> http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java?view=diff&rev=501805&r1=501804&r2=501805
> ==============================================================================
> ---
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java
(original)
> +++
> webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/OperationClient.java
Wed Jan 31 03:32:17 2007
> @@ -25,11 +25,11 @@
>  import org.apache.axis2.context.OperationContext;
>  import org.apache.axis2.context.ServiceContext;
>  import org.apache.axis2.description.AxisOperation;
> -import org.apache.axis2.description.TransportOutDescription;
>  import org.apache.axis2.description.ClientUtils;
> +import org.apache.axis2.description.TransportOutDescription;
>  import org.apache.axis2.i18n.Messages;
> -import org.apache.axis2.util.UUIDGenerator;
>  import org.apache.axis2.util.TargetResolver;
> +import org.apache.axis2.util.UUIDGenerator;
>  import org.apache.axis2.wsdl.WSDLConstants;
>  
>  import java.util.Iterator;
> @@ -47,31 +47,31 @@
>   */
>  public abstract class OperationClient {
>  
> -     protected AxisOperation axisOp;
> - 
> -     protected ServiceContext sc;
> - 
> -     protected Options options;
> - 
> -     protected OperationContext oc;
> - 
> -     protected Callback callback;
> - 
> -     /*
> -      * indicates whether the MEP execution has completed (and hence
> ready for
> -      * resetting)
> -      */
> -     protected boolean completed;
> - 
> -     protected OperationClient(AxisOperation axisOp, ServiceContext
> sc,
> -                               Options options) {
> -         this.axisOp = axisOp;
> -         this.sc = sc;
> -         this.options = options;
> -         this.completed = false;
> -         this.oc = new OperationContext(axisOp);
> -         this.oc.setParent(this.sc);
> -     }
> +    protected AxisOperation axisOp;
> +
> +    protected ServiceContext sc;
> +
> +    protected Options options;
> +
> +    protected OperationContext oc;
> +
> +    protected Callback callback;
> +
> +    /*
> +    * indicates whether the MEP execution has completed (and hence
> ready for
> +    * resetting)
> +    */
> +    protected boolean completed;
> +
> +    protected OperationClient(AxisOperation axisOp, ServiceContext
> sc,
> +                              Options options) {
> +        this.axisOp = axisOp;
> +        this.sc = sc;
> +        this.options = new Options(options);
> +        this.completed = false;
> +        this.oc = new OperationContext(axisOp);
> +        this.oc.setParent(this.sc);
> +    }
>  
>      /**
>       * Sets the options that should be used for this particular
> client. This
> @@ -162,11 +162,11 @@
>  
>  
>      /**
> -     * To close the transport if necessary , can call this method.
> The main 
> -     * usage of this method is when client uses two tarnsports for
> sending and 
> -     * receiving , and we need to remove entries for waiting calls in
> the 
> +     * To close the transport if necessary , can call this method.
> The main
> +     * usage of this method is when client uses two tarnsports for
> sending and
> +     * receiving , and we need to remove entries for waiting calls in
> the
>       * transport listener queue.
> -     * Note : DO NOT call this method if you are not using two
> transports to 
> +     * Note : DO NOT call this method if you are not using two
> transports to
>       * send and receive
>       *
>       * @param msgCtxt : MessageContext# which has all the transport
> information
> @@ -215,7 +215,8 @@
>  
>      protected void addReferenceParameters(MessageContext msgctx) {
>          EndpointReference to = msgctx.getTo();
> -        if (options.isManageSession()) {
> +        if (options.isManageSession() || (options.getParent() != null
> &&
> +                options.getParent().isManageSession())) {
>              EndpointReference tepr = sc.getTargetEPR();
>              if (tepr != null) {
>                  Map map = tepr.getAllReferenceParameters();
> @@ -232,7 +233,7 @@
>          }
>      }
>  
> -    protected void prepareMessageContext(ConfigurationContext cc,
> MessageContext mc)  throws AxisFault{
> +    protected void prepareMessageContext(ConfigurationContext cc,
> MessageContext mc) throws AxisFault {
>          // set options on the message context
>          if (mc.getSoapAction() == null ||
> "".equals(mc.getSoapAction())) {
>              mc.setSoapAction(options.getAction());
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org


Mime
View raw message