cvs commit: xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis WSIFOperation_ApacheAxis.java

[antelder]

antelder    2003/01/13 12:46:31

  Modified:    java/src/org/apache/wsif/providers/soap/apacheaxis
                        WSIFOperation_ApacheAxis.java
  Log:
  Fix bugzilla bug 15780 - part 1 - enable context on WSIFService and WSIFPort
  
  Revision  Changes    Path
  1.57      +14 -11    
xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java
  
  Index: WSIFOperation_ApacheAxis.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/soap/apacheaxis/WSIFOperation_ApacheAxis.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- WSIFOperation_ApacheAxis.java     13 Jan 2003 20:02:25 -0000      1.56
  +++ WSIFOperation_ApacheAxis.java     13 Jan 2003 20:46:30 -0000      1.57
  @@ -118,8 +118,8 @@
   import org.apache.wsif.WSIFCorrelationId;
   import org.apache.wsif.WSIFException;
   import org.apache.wsif.WSIFMessage;
  +import org.apache.wsif.WSIFPort;
   import org.apache.wsif.WSIFResponseHandler;
  -import org.apache.wsif.base.WSIFDefaultMessage;
   import org.apache.wsif.base.WSIFDefaultOperation;
   import org.apache.wsif.logging.Trc;
   import org.apache.wsif.providers.WSIFDynamicTypeMap;
  @@ -942,6 +942,12 @@
                return operationStyle;
        }
   
  +    public WSIFPort getWSIFPort() {
  +        Trc.entry(this);
  +        Trc.exit(wsifPort);
  +        return wsifPort;
  +    }
  +    
        /**
         * Tests if the currently executing request is an asynchronous request.
         * 
  @@ -2298,20 +2304,18 @@
                }
                HashMap props = dest.getProperties();
                if (props != null) {
  -                     if (context == null) {
  -                             context = new WSIFDefaultMessage();
  -                     }
  -                     context.setParts(props);
  +                     getContext().setParts(props);
                }
        }
   
        /**
         * This sets up any context JMS property values in the Destination
         */
  -     private void setDestinationContext(WSIFJMSDestination dest) {
  -             if (context == null || dest == null) {
  +     private void setDestinationContext(WSIFJMSDestination dest) throws 
WSIFException {
  +             if (dest == null) {
                        return;
                }
  +             WSIFMessage context = getContext();
                HashMap jmsProps = new HashMap();
                for (Iterator i = context.getPartNames(); i.hasNext();) {
                        String partName = (String) i.next();
  @@ -2339,12 +2343,11 @@
         * This sets up the context headers in the axis 
         * Call object prior to invoke method being issued.
         */
  -     private void setCallContext(Call call) {
  +     private void setCallContext(Call call) throws WSIFException {
                Object o;
                String name;
  -             if (context == null) {
  -                     return;
  -             }
  +             WSIFMessage context = getContext();
  +
                name = WSIFConstants.CONTEXT_HTTP_USER;
                try {
                        o = context.getObjectPart(name);