Author: slaws
Date: Mon Mar 17 08:57:49 2008
New Revision: 637951
URL: http://svn.apache.org/viewvc?rev=637951&view=rev
Log:
TUSCANY-2056
Remove an over zealous clear() from the previous checking that got in there by
mistake. Update one of the callback test cases to test for this situation.
Modified:
incubator/tuscany/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
incubator/tuscany/java/sca/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
Modified:
incubator/tuscany/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java?rev=637951&r1=637950&r2=637951&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
(original)
+++
incubator/tuscany/java/sca/itest/callablereferences-ws/src/main/java/org/apache/tuscany/sca/itest/callablerefwsreturn/AlphaImpl.java
Mon Mar 17 08:57:49 2008
@@ -34,6 +34,8 @@
@Context
protected ComponentContext componentContext;
+
+ Object conversationId0 = null;
public boolean run() {
CallableReference<Gamma> gammaRef = null;
@@ -48,10 +50,10 @@
// no Conversation exists
Conversation con = gammaRef.getConversation();
if (con == null) {
- System.out.println("Alpha: Conversation to gamma is null");
+ System.out.println("Alpha1: Conversation to gamma is null");
} else {
System.out
- .println("Alpha: Conversation to gamma exists.
conversationId="
+ .println("Alpha1: Conversation to gamma exists.
conversationId="
+ con.getConversationID());
conversationId1 = con.getConversationID();
}
@@ -59,18 +61,28 @@
// this call should reuse a Conversation, but as none exists it
// creates a new conversation
gammaRef.getService().doSomething();
+ gammaRef.getService().doSomething();
+ gammaRef.getService().doSomething();
+
con = gammaRef.getConversation();
if (con == null) {
- System.out.println("Alpha: Conversation to gamma is null");
+ System.out.println("Alpha2: Conversation to gamma is null");
} else {
System.out
- .println("Alpha: Conversation to gamma exists.
conversationId="
+ .println("Alpha2: Conversation to gamma exists.
conversationId="
+ con.getConversationID());
conversationId2 = con.getConversationID();
}
boolean testPassed = conversationId1.equals(conversationId2);
- return testPassed;
+
+ if (conversationId0 == null){
+ conversationId0 = conversationId1;
+ return testPassed;
+ } else {
+ return testPassed &&
(!conversationId0.equals(conversationId1));
+ }
+
} catch (Exception e) {
e.printStackTrace();
return false;
Modified:
incubator/tuscany/java/sca/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java?rev=637951&r1=637950&r2=637951&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/callablereferences-ws/src/test/java/org/apache/tuscany/sca/itest/callablerefws/CallableReferenceReturnTestCase.java
Mon Mar 17 08:57:49 2008
@@ -43,6 +43,7 @@
@Test
public void testCallableReferenceReturn() {
Assert.assertTrue(alpha.run());
+ Assert.assertTrue(alpha.run());
}
}
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=637951&r1=637950&r2=637951&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:57:49 2008
@@ -371,7 +371,7 @@
}
if (refParams == null) {
refParams = new ReferenceParametersImpl();
-
+
// remove any existing reference parameters from the clone
Object toRemove = null;
for (Object extension : clonedRef.getExtensions()){
@@ -379,12 +379,10 @@
toRemove = extension;
}
}
-
+
if (toRemove != null){
clonedRef.getExtensions().remove(toRemove);
}
-
- clonedRef.getExtensions().clear();
// add the new reference parameter object
clonedRef.getExtensions().add(refParams);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
