You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by hu...@apache.org on 2002/10/23 15:35:12 UTC

cvs commit: xml-axis-wsif/java/src/org/apache/wsif/base WSIFDefaultOperation.java

hughesj     2002/10/23 06:35:12

  Modified:    java/src/org/apache/wsif/base WSIFDefaultOperation.java
  Log:
  createInputOperation() and createOutputOperation() were not setting the name of
  the returned WSIFMessage or setting the message definition on WSIFMessage.
  createInputOperation(String) and createOutputOperation(String) were changed.
  This fix is to bring them in sync.
  
  Revision  Changes    Path
  1.16      +30 -10    xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultOperation.java
  
  Index: WSIFDefaultOperation.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/base/WSIFDefaultOperation.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- WSIFDefaultOperation.java	10 Oct 2002 15:50:25 -0000	1.15
  +++ WSIFDefaultOperation.java	23 Oct 2002 13:35:12 -0000	1.16
  @@ -152,9 +152,19 @@
        */
       public WSIFMessage createInputMessage() {
           Trc.entry(this);
  -        WSIFMessage wm = new WSIFDefaultMessage();
  -        Trc.exit(wm);
  -        return wm;
  +        WSIFMessage msg = new WSIFDefaultMessage();
  +        if (msg != null) {
  +            // Now find the javax.wsdl.Message & set it on the WSIFMessage
  +            try {
  +                msg.setMessageDefinition(
  +                    getOperation().getInput().getMessage());
  +                msg.setName(getOperation().getInput().getName());
  +            } catch (Exception e) {
  +                Trc.ignoredException(e);
  +            }
  +        }
  +        Trc.exit(msg);
  +        return msg;
       }
   
       /**
  @@ -182,9 +192,19 @@
        */
       public WSIFMessage createOutputMessage() {
           Trc.entry(this);
  -        WSIFMessage wm = new WSIFDefaultMessage();
  -        Trc.exit(wm);
  -        return wm;
  +        WSIFMessage msg = new WSIFDefaultMessage();
  +        if (msg != null) {
  +            // Now find the javax.wsdl.Message & set it on the WSIFMessage
  +            try {
  +                msg.setMessageDefinition(
  +                    getOperation().getOutput().getMessage());
  +                msg.setName(getOperation().getOutput().getName());
  +            } catch (Exception e) {
  +                Trc.ignoredException(e);
  +            }
  +        }
  +        Trc.exit(msg);
  +        return msg;
       }
   
       /**
  @@ -354,7 +374,7 @@
                               true,
                               Thread.currentThread().getContextClassLoader());
                   } catch (ClassNotFoundException cce) {
  -                  	Trc.exception(cce);
  +                    Trc.exception(cce);
                       throw new WSIFException(
                           "Unexpected ClassNotFoundException when processing "
                               + "jms:propertyValue "
  @@ -385,7 +405,7 @@
                           throw new WSIFException(
                               "jms:propertyValue " + name + " had an invalid type");
                   } catch (NumberFormatException nfe) {
  -                 	Trc.exception(nfe);
  +                    Trc.exception(nfe);
                       throw new WSIFException(
                           "jms:propertyValue "
                               + name
  @@ -419,7 +439,7 @@
       public WSIFMessage getContext() {
           Trc.entry(this);
           if ( context == null ) {
  -        	context = new WSIFDefaultMessage();
  +            context = new WSIFDefaultMessage();
           }
           Trc.exit(context);
           return context;
  @@ -428,7 +448,7 @@
       abstract protected Operation getOperation() throws Exception;
       
       protected void close() throws WSIFException {
  -	Trc.entry(this);
  +    Trc.entry(this);
           if (closed)
               throw new WSIFException("Cannot reuse a WSIFOperation to invoke multiple operations");
           closed = true;