svn commit: r478762 - /webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/RMMsgCreator.java

[chamikara]

Author: chamikara
Date: Thu Nov 23 20:15:57 2006
New Revision: 478762

URL: http://svn.apache.org/viewvc?view=rev&rev=478762
Log:
RMMsgCreator should get the AxisOperation from the AxisService of the 
referenced message.

Modified:
    
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/RMMsgCreator.java

Modified: 
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/RMMsgCreator.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/RMMsgCreator.java?view=diff&rev=478762&r1=478761&r2=478762
==============================================================================
--- 
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/RMMsgCreator.java
 (original)
+++ 
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/RMMsgCreator.java
 Thu Nov 23 20:15:57 2006
@@ -218,7 +218,11 @@
                try {
                        // creating by copying common contents. (this will not 
set contexts
                        // except for configCtx).
-                       AxisOperation createSequenceOperation = 
AxisOperationFactory
+                       AxisOperation createSequenceOperation = 
applicationMsgContext.getAxisService()
+                                               .getOperation(new QName 
(Sandesha2Constants.RM_IN_OUT_OPERATION_NAME)); 
+                               
+                       if (createSequenceOperation==null)      
+                               createSequenceOperation = AxisOperationFactory
                                        
.getAxisOperation(WSDL20_2004Constants.MEP_CONSTANT_OUT_IN);
 
                        createSeqmsgContext = SandeshaUtil
@@ -381,10 +385,11 @@
                if (referenceMessage == null)
                        throw new 
SandeshaException(SandeshaMessageHelper.getMessage(SandeshaMessageKeys.msgContextNotSet));
 
-               AxisOperation terminateOperation = null;
+               AxisOperation terminateOperation = 
referenceMessage.getAxisService().getOperation(new QName 
(Sandesha2Constants.RM_IN_OUT_OPERATION_NAME));
 
                try {
-                       terminateOperation = 
AxisOperationFactory.getAxisOperation(WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY);
+                       if (terminateOperation==null)
+                               terminateOperation = 
AxisOperationFactory.getAxisOperation(WSDL20_2004Constants.MEP_CONSTANT_OUT_ONLY);
                } catch (AxisFault e1) {
                        throw new SandeshaException(e1.getMessage());
                }
@@ -713,7 +718,10 @@
                String rmNamespaceValue = 
referenceRMMessage.getRMNamespaceValue();
                String rmVersion = referenceRMMessage.getRMSpecVersion();
                
-               AxisOperation makeConnectionOperation = 
AxisOperationFactory.getAxisOperation(
+               AxisOperation makeConnectionOperation = referenceMessage.
+                                               
getAxisService().getOperation(new QName 
(Sandesha2Constants.RM_IN_OUT_OPERATION_NAME)); 
+                       
+               makeConnectionOperation = AxisOperationFactory.getAxisOperation(
                                WSDL20_2004Constants.MEP_CONSTANT_OUT_IN);
                
                MessageContext makeConnectionMessageCtx = 
SandeshaUtil.createNewRelatedMessageContext(referenceRMMessage,makeConnectionOperation);



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