owenb 2002/11/08 06:16:43
Modified: java/src/org/apache/wsif/providers/ejb Tag: pre1_2_0-patches
WSIFOperation_EJB.java
java/src/org/apache/wsif/providers/java Tag:
pre1_2_0-patches WSIFOperation_Java.java
Log:
Set the message definition on the fault message when the fault message is populated
in executeRequestResponse
Revision Changes Path
No revision
No revision
1.19.2.2 +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.19.2.1
retrieving revision 1.19.2.2
diff -u -r1.19.2.1 -r1.19.2.2
--- WSIFOperation_EJB.java 1 Nov 2002 15:26:54 -0000 1.19.2.1
+++ WSIFOperation_EJB.java 8 Nov 2002 14:16:43 -0000 1.19.2.2
@@ -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) {
No revision
No revision
1.21.2.2 +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.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- WSIFOperation_Java.java 1 Nov 2002 15:26:54 -0000 1.21.2.1
+++ WSIFOperation_Java.java 8 Nov 2002 14:16:43 -0000 1.21.2.2
@@ -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...
