svn commit: r578073 - /webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java

[deepal]

Author: deepal
Date: Fri Sep 21 04:46:22 2007
New Revision: 578073

URL: http://svn.apache.org/viewvc?rev=578073&view=rev
Log:
fixing NPE in Axis2

Modified:
    
webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java

Modified: 
webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java?rev=578073&r1=578072&r2=578073&view=diff
==============================================================================
--- 
webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
 (original)
+++ 
webservices/sandesha/branches/sandesha2/java/1_3/modules/core/src/main/java/org/apache/sandesha2/workers/SenderWorker.java
 Fri Sep 21 04:46:22 2007
@@ -536,14 +536,18 @@
                                        responseMessageContext = new 
MessageContext();
 
                                OperationContext requestMsgOpCtx = 
msgCtx.getOperationContext();
-                               
responseMessageContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
 requestMsgOpCtx
+                
responseMessageContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
 requestMsgOpCtx
                                                                
.getProperty(Constants.Configuration.CHARACTER_SET_ENCODING));
                                
responseMessageContext.setProperty(Constants.Configuration.CONTENT_TYPE, 
requestMsgOpCtx
                                                                
.getProperty(Constants.Configuration.CONTENT_TYPE));
                                
responseMessageContext.setProperty(HTTPConstants.MTOM_RECEIVED_CONTENT_TYPE, 
requestMsgOpCtx
                                                                
.getProperty(HTTPConstants.MTOM_RECEIVED_CONTENT_TYPE));
+                responseMessageContext.setOperationContext(requestMsgOpCtx);
+                if ( !requestMsgOpCtx.isComplete()) {
+                    requestMsgOpCtx.addMessageContext(responseMessageContext);
+                }
 
-                               //If the response MsgCtx was not available 
Axis2 would hv put the transport info into a 
+                //If the response MsgCtx was not available Axis2 would hv put 
the transport info into a
                                //HashMap, getting the data from it.
                                HashMap transportInfoMap = (HashMap) 
msgCtx.getProperty(Constants.Configuration.TRANSPORT_INFO_MAP);
                                if (transportInfoMap != null) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]