svn commit: r832386 - in /webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail: MailTransportSender.java WSMimeMessage.java

[amilas]

Author: amilas
Date: Tue Nov  3 10:51:57 2009
New Revision: 832386

URL: http://svn.apache.org/viewvc?rev=832386&view=rev
Log:
set the MailConstants.MAIL_HEADER_X_MESSAGE_ID as well. other wise synchronous 
invocations does not work with gmail due to the reason 
given at class coment
wait should only happens at client side and for out in operations.

Modified:
    
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java
    
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java

Modified: 
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java?rev=832386&r1=832385&r2=832386&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java
 (original)
+++ 
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportSender.java
 Tue Nov  3 10:51:57 2009
@@ -25,10 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.OutOnlyAxisOperation;
-import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.description.*;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.transport.OutTransportInfo;
@@ -194,7 +191,7 @@
     private void waitForReply(MessageContext msgContext, String mailMessageID) 
throws AxisFault {
         // piggy back message constant is used to pass a piggy back
         // message context in asnych model
-        if (msgContext.getAxisOperation() instanceof OutOnlyAxisOperation &&
+        if (!(msgContext.getAxisOperation() instanceof OutInAxisOperation) &&
                 
(msgContext.getProperty(org.apache.axis2.Constants.PIGGYBACK_MESSAGE) == null)) 
{
             return;
         }

Modified: 
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java?rev=832386&r1=832385&r2=832386&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java
 (original)
+++ 
webservices/commons/trunk/modules/transport/modules/mail/src/main/java/org/apache/axis2/transport/mail/WSMimeMessage.java
 Tue Nov  3 10:51:57 2009
@@ -46,7 +46,9 @@
     @Override
     protected void updateMessageID() throws MessagingException {
            if (getHeader(MailConstants.MAIL_HEADER_MESSAGE_ID) == null) {
-            setHeader(MailConstants.MAIL_HEADER_MESSAGE_ID, 
UUIDGenerator.getUUID());    
+            String uuid = UUIDGenerator.getUUID();
+            setHeader(MailConstants.MAIL_HEADER_MESSAGE_ID, uuid);
+            setHeader(MailConstants.MAIL_HEADER_X_MESSAGE_ID, uuid);
         }
     }