Author: slaws
Date: Mon Mar 17 08:04:58 2008
New Revision: 637927
URL: http://svn.apache.org/viewvc?rev=637927&view=rev
Log:
TUSCANY-2056
When turning a callable reference into XML only put one set of reference
parameters out
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java?rev=637927&r1=637926&r2=637927&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
Mon Mar 17 08:04:58 2008
@@ -278,7 +278,7 @@
ExtendedConversation conversation =
conversationManager.getConversation(parameters.getConversationID());
if (conversation == null){
-
conversationManager.startConversation(parameters.getConversationID());
+ conversation =
conversationManager.startConversation(parameters.getConversationID());
}
this.conversation = conversation;
} else {
@@ -371,6 +371,22 @@
}
if (refParams == null) {
refParams = new ReferenceParametersImpl();
+
+ // remove any existing reference parameters from the clone
+ Object toRemove = null;
+ for (Object extension : clonedRef.getExtensions()){
+ if (extension instanceof ReferenceParameters){
+ toRemove = extension;
+ }
+ }
+
+ if (toRemove != null){
+ clonedRef.getExtensions().remove(toRemove);
+ }
+
+ clonedRef.getExtensions().clear();
+
+ // add the new reference parameter object
clonedRef.getExtensions().add(refParams);
}
refParams.setCallbackID(callbackID);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
