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 di...@apache.org on 2003/10/16 16:59:37 UTC
cvs commit: ws-axis/java/src/org/apache/axis/client Call.java
dims 2003/10/16 07:59:37
Modified: java/src/org/apache/axis/client Call.java
Log:
Fix for Bug 22241 - Condition is always true in an if-statemant located at class Client
Cleaned up the code a wee bit as well.
Revision Changes Path
1.210 +6 -8 ws-axis/java/src/org/apache/axis/client/Call.java
Index: Call.java
===================================================================
RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/client/Call.java,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- Call.java 6 Oct 2003 19:49:25 -0000 1.209
+++ Call.java 16 Oct 2003 14:59:37 -0000 1.210
@@ -1713,10 +1713,8 @@
env = new SOAPEnvelope(msgContext.getSOAPConstants(),
msgContext.getSchemaVersion());
- if ( !(params[0] instanceof SOAPEnvelope) ) {
- for ( i = 0 ; i < params.length ; i++ ) {
- env.addBodyElement( (SOAPBodyElement) params[i] );
- }
+ for (i = 0; i < params.length; i++) {
+ env.addBodyElement((SOAPBodyElement) params[i]);
}
Message msg = new Message( env );
@@ -1807,7 +1805,7 @@
invoke();
msg = msgContext.getResponseMessage();
if (msg == null) {
- if (this.FAULT_ON_NO_RESPONSE) {
+ if (FAULT_ON_NO_RESPONSE) {
throw new AxisFault(Messages.getMessage("nullResponse00"));
} else {
return null;
@@ -2046,9 +2044,9 @@
Attachments attachments=msg.getAttachmentsImpl();
if(null != attachments) {
if( ATTACHMENT_ENCAPSULATION_FORMAT_MIME.equals(attachformat)) {
- attachments.setSendType(attachments.SEND_TYPE_MIME);
+ attachments.setSendType(Attachments.SEND_TYPE_MIME);
} else if ( ATTACHMENT_ENCAPSULATION_FORMAT_DIME.equals(attachformat)) {
- attachments.setSendType(attachments.SEND_TYPE_DIME);
+ attachments.setSendType(Attachments.SEND_TYPE_DIME);
}
}
}
@@ -2659,7 +2657,7 @@
if (resMsg == null) {
//TODO: stevel: this is a constant. it is always true. so why the condition?
- if (this.FAULT_ON_NO_RESPONSE) {
+ if (FAULT_ON_NO_RESPONSE) {
throw new AxisFault(Messages.getMessage("nullResponse00"));
} else {
return;