svn commit: r1056979 - in /axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2: util/SandeshaUtil.java workers/SenderWorker.java

[veithen]

Author: veithen
Date: Sun Jan  9 17:00:21 2011
New Revision: 1056979

URL: http://svn.apache.org/viewvc?rev=1056979&view=rev
Log:
Fixed a build failure caused by the change described in AXIS2-4196.

Modified:
    
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
    
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java

Modified: 
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java?rev=1056979&r1=1056978&r2=1056979&view=diff
==============================================================================
--- 
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
 (original)
+++ 
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
 Sun Jan  9 17:00:21 2011
@@ -933,9 +933,9 @@ public class SandeshaUtil {
                        msgContext.setTransportOut(sandesha2TransportOutDesc);
                        
                        //this invocation has to be a blocking one.
-                       Boolean isTransportNonBlocking = (Boolean) 
msgContext.getProperty(MessageContext.TRANSPORT_NON_BLOCKING);
+                       Boolean isTransportNonBlocking = (Boolean) 
msgContext.getProperty(MessageContext.CLIENT_API_NON_BLOCKING);
                        if (isTransportNonBlocking!=null && 
isTransportNonBlocking.booleanValue())
-                               
msgContext.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, Boolean.FALSE);
+                               
msgContext.setProperty(MessageContext.CLIENT_API_NON_BLOCKING, Boolean.FALSE);
        
                        // sending the message once through 
Sandesha2TransportSender.
                        if (msgContext.isPaused())
@@ -944,7 +944,7 @@ public class SandeshaUtil {
                                AxisEngine.send(msgContext);    
                        }
                        //put the original value of isTransportNonBlocking back 
on
-                       
msgContext.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, 
isTransportNonBlocking);
+                       
msgContext.setProperty(MessageContext.CLIENT_API_NON_BLOCKING, 
isTransportNonBlocking);
                }
                if (LoggingControl.isAnyTracingEnabled() && 
log.isDebugEnabled())
                        log.debug("Exit: SandeshaUtil::executeAndStore");

Modified: 
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java?rev=1056979&r1=1056978&r2=1056979&view=diff
==============================================================================
--- 
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
 (original)
+++ 
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
 Sun Jan  9 17:00:21 2011
@@ -326,12 +326,12 @@ public class SenderWorker extends Sandes
                                                if (log.isDebugEnabled())
                                                        log.debug("Resuming a 
send for message : " + msgCtx.getEnvelope().getHeader());
                                                msgCtx.setPaused(false);
-                                               
msgCtx.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, Boolean.FALSE);
+                                               
msgCtx.setProperty(MessageContext.CLIENT_API_NON_BLOCKING, Boolean.FALSE);
                                                response = 
AxisEngine.resumeSend(msgCtx);
                                        } else {
                                                if (log.isDebugEnabled())
                                                        log.debug("Sending a 
message : " + msgCtx.getEnvelope().getHeader());
-                                               
msgCtx.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, Boolean.FALSE);
+                                               
msgCtx.setProperty(MessageContext.CLIENT_API_NON_BLOCKING, Boolean.FALSE);
                                                AxisEngine.send(msgCtx);  // 
TODO check if this should return an invocation response
                                        }
                                } else {
@@ -350,7 +350,7 @@ public class SenderWorker extends Sandes
                                
                                        if (log.isDebugEnabled())
                                                log.debug("Resuming a send for 
message : " + msgCtx.getEnvelope().getHeader());
-                               
msgCtx.setProperty(MessageContext.TRANSPORT_NON_BLOCKING, Boolean.FALSE);
+                               
msgCtx.setProperty(MessageContext.CLIENT_API_NON_BLOCKING, Boolean.FALSE);
                                        response = 
AxisEngine.resumeSend(msgCtx);
                                }
                                if(log.isDebugEnabled()) log.debug("Engine 
resume returned " + response);