axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ow...@apache.org
Subject cvs commit: xml-axis-wsif/java/src/org/apache/wsif/providers/java WSIFOperation_Java.java
Date Fri, 08 Nov 2002 14:19:46 GMT
owenb       2002/11/08 06:19:46

  Modified:    java/src/org/apache/wsif/providers/ejb
                        WSIFOperation_EJB.java
               java/src/org/apache/wsif/providers/java
                        WSIFOperation_Java.java
  Log:
  Set the message definition on the fault message when the fault message is populated in executeRequestResponse
  
  Revision  Changes    Path
  1.21      +13 -0     xml-axis-wsif/java/src/org/apache/wsif/providers/ejb/WSIFOperation_EJB.java
  
  Index: WSIFOperation_EJB.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/ejb/WSIFOperation_EJB.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- WSIFOperation_EJB.java	1 Nov 2002 15:28:11 -0000	1.20
  +++ WSIFOperation_EJB.java	8 Nov 2002 14:19:45 -0000	1.21
  @@ -74,6 +74,7 @@
   import javax.wsdl.BindingInput;
   import javax.wsdl.BindingOperation;
   import javax.wsdl.BindingOutput;
  +import javax.wsdl.Fault;
   import javax.wsdl.Message;
   import javax.wsdl.Operation;
   import javax.wsdl.OperationType;
  @@ -1077,6 +1078,12 @@
                   // Should we use the class of the method signature here ?
                   fault.setObjectPart(faultMessageInfo.fieldPartName, faultPart);
                   fault.setName(faultMessageInfo.fieldMessageName);
  +                if (faultMessageInfo.fieldMessageName != null) {
  +                	Fault wsdlFault = fieldBindingOperationModel.getOperation().getFault(faultMessageInfo.fieldMessageName);
  +                	if (wsdlFault != null) {
  +                	    fault.setMessageDefinition(wsdlFault.getMessage());
  +                	}
  +                }
                   operationSucceeded = false;
               } else {
                   // Try to find a matching class:
  @@ -1100,6 +1107,12 @@
                                   faultMessageInfo.fieldPartName,
                                   faultPart);
                               fault.setName(faultMessageInfo.fieldMessageName);
  +                            if (faultMessageInfo.fieldMessageName != null) {
  +                            	Fault wsdlFault = fieldBindingOperationModel.getOperation().getFault(faultMessageInfo.fieldMessageName);
  +                	            if (wsdlFault != null) {
  +                	            	fault.setMessageDefinition(wsdlFault.getMessage());
  +                	            }
  +                            }
                               operationSucceeded = false;
                           }
                       } catch (Exception exc) {
  
  
  
  1.23      +14 -0     xml-axis-wsif/java/src/org/apache/wsif/providers/java/WSIFOperation_Java.java
  
  Index: WSIFOperation_Java.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/java/WSIFOperation_Java.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- WSIFOperation_Java.java	1 Nov 2002 15:28:11 -0000	1.22
  +++ WSIFOperation_Java.java	8 Nov 2002 14:19:46 -0000	1.23
  @@ -73,6 +73,8 @@
   import javax.wsdl.BindingOperation;
   import javax.wsdl.BindingOutput;
   import javax.wsdl.Definition;
  +import javax.wsdl.Fault;
  +import javax.wsdl.Message;
   import javax.wsdl.Operation;
   import javax.wsdl.OperationType;
   import javax.wsdl.Part;
  @@ -1130,6 +1132,12 @@
                   // Should we use the class of the method signature here ?
                   fault.setObjectPart(faultMessageInfo.fieldPartName, faultPart);
                   fault.setName(faultMessageInfo.fieldMessageName);
  +                if (faultMessageInfo.fieldMessageName != null) {
  +                	Fault wsdlFault = fieldBindingOperationModel.getOperation().getFault(faultMessageInfo.fieldMessageName);
  +                	if (wsdlFault != null) {
  +                	    fault.setMessageDefinition(wsdlFault.getMessage());
  +                	}
  +                }
                   operationSucceeded = false;
               } else {
                   // Try to find a matching class:
  @@ -1151,6 +1159,12 @@
                               // Should we use the class of the method signature here ?
                               fault.setObjectPart(faultMessageInfo.fieldPartName, faultPart);
                               fault.setName(faultMessageInfo.fieldMessageName);
  +                            if (faultMessageInfo.fieldMessageName != null) {
  +                            	Fault wsdlFault = fieldBindingOperationModel.getOperation().getFault(faultMessageInfo.fieldMessageName);
  +                	            if (wsdlFault != null) {
  +                	            	fault.setMessageDefinition(wsdlFault.getMessage());
  +                	            }
  +                            }
                               operationSucceeded = false;
                           }
                       } catch (Exception exc) { // Nothing to do - just try the next one...
  
  
  

Mime
View raw message