Author: nash
Date: Fri May 9 08:38:13 2008
New Revision: 654860
URL: http://svn.apache.org/viewvc?rev=654860&view=rev
Log:
Fixed TUSCANY-2306
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java?rev=654860&r1=654859&r2=654860&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
Fri May 9 08:38:13 2008
@@ -93,12 +93,14 @@
JavaInterface javaInterface = (JavaInterface)
callbackReference.getInterfaceContract().getInterface();
Class<CB> javaClass = (Class<CB>)javaInterface.getJavaClass();
List<RuntimeWire> wires = callbackReference.getRuntimeWires();
- CallbackReferenceImpl ref = new CallbackReferenceImpl(javaClass,
proxyFactory, wires);
- //ref.resolveTarget();
- ReferenceParameters parameters =
msgContext.getFrom().getReferenceParameters();
- ref.attachCallbackID(parameters.getCallbackID());
- if (ref.getConversation() != null) {
- ref.attachConversationID(parameters.getConversationID());
+ CallbackReferenceImpl ref =
CallbackReferenceImpl.newInstance(javaClass, proxyFactory, wires);
+ if (ref != null) {
+ //ref.resolveTarget();
+ ReferenceParameters parameters =
msgContext.getFrom().getReferenceParameters();
+ ref.attachCallbackID(parameters.getCallbackID());
+ if (ref.getConversation() != null) {
+ ref.attachConversationID(parameters.getConversationID());
+ }
}
return ref;
}
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java?rev=654860&r1=654859&r2=654860&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
Fri May 9 08:38:13 2008
@@ -43,7 +43,14 @@
private EndpointReference resolvedEndpoint;
private Object convID;
- public CallbackReferenceImpl(Class<B> interfaze, ProxyFactory
proxyFactory, List<RuntimeWire> wires) {
+ public static CallbackReferenceImpl newInstance(Class interfaze,
+ ProxyFactory proxyFactory,
+ List<RuntimeWire> wires) {
+ CallbackReferenceImpl ref = new CallbackReferenceImpl(interfaze,
proxyFactory, wires);
+ return ref.getResolvedEndpoint() != null ? ref : null;
+ }
+
+ private CallbackReferenceImpl(Class<B> interfaze, ProxyFactory
proxyFactory, List<RuntimeWire> wires) {
super(interfaze, null, proxyFactory);
this.wires = wires;
init();
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java?rev=654860&r1=654859&r2=654860&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
Fri May 9 08:38:13 2008
@@ -42,7 +42,7 @@
}
public CallableReference<?> getInstance() throws ObjectCreationException {
- return new CallbackReferenceImpl(businessInterface, proxyFactory,
wires);
+ return CallbackReferenceImpl.newInstance(businessInterface,
proxyFactory, wires);
}
}
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java?rev=654860&r1=654859&r2=654860&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
Fri May 9 08:38:13 2008
@@ -79,8 +79,8 @@
* JDKCallbackInvocationHandler as JDKProxyService.
*/
public <T> T createCallbackProxy(Class<T> interfaze, final
List<RuntimeWire> wires) throws ProxyCreationException {
- CallbackReferenceImpl<T> callbackReference = new
CallbackReferenceImpl(interfaze, this, wires);
- return createCallbackProxy(callbackReference);
+ CallbackReferenceImpl<T> callbackReference =
CallbackReferenceImpl.newInstance(interfaze, this, wires);
+ return callbackReference != null ?
createCallbackProxy(callbackReference) : null;
}
/**
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java?rev=654860&r1=654859&r2=654860&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
Fri May 9 08:38:13 2008
@@ -76,8 +76,8 @@
}
public <T> T createCallbackProxy(Class<T> interfaze, List<RuntimeWire>
wires) throws ProxyCreationException {
- CallbackReferenceImpl<T> callbackReference = new
CallbackReferenceImpl(interfaze, this, wires);
- return createCallbackProxy(callbackReference);
+ CallbackReferenceImpl<T> callbackReference =
CallbackReferenceImpl.newInstance(interfaze, this, wires);
+ return callbackReference != null ?
createCallbackProxy(callbackReference) : null;
}
public <T> T createCallbackProxy(CallbackReferenceImpl<T>
callbackReference) throws ProxyCreationException {
Modified:
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java?rev=654860&r1=654859&r2=654860&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/conversation/callback/src/test/java/org/apache/tuscany/sca/vtest/javaapi/conversation/callback/CallbackTestCase.java
Fri May 9 08:38:13 2008
@@ -253,7 +253,7 @@
*
*/
@Test
- @Ignore("TUSCANY-2306")
+ // @Ignore("TUSCANY-2306")
public void statelessCallback3() throws Exception {
System.out.println("Setting up for stateless callback ref null tests");
domain =
SCADomain.newInstance("callback-stateless-callbackfieldnull.composite");
