Author: rfeng
Date: Sat Sep  1 12:04:56 2007
New Revision: 571858

URL: http://svn.apache.org/viewvc?rev=571858&view=rev
Log:
Change the test per Simon's suggestion

Modified:
    
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java

Modified: 
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java?rev=571858&r1=571857&r2=571858&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
 Sat Sep  1 12:04:56 2007
@@ -39,12 +39,11 @@
 
     public Message invoke(Message msg) {
         CallableReference<?> callableReference = msg.getCallableReference();
-        if (callableReference instanceof ServiceReference) {
-            if (((ServiceReference<?>)callableReference).getCallback() == 
null) {
-                throw new NoRegisteredCallbackException("Callback target does 
not implement the callback interface");
-            }
+        if (callableReference instanceof ServiceReference && 
((ServiceReference<?>)callableReference).getCallback() != null) {
+            return next.invoke(msg);
+        } else {
+            throw new NoRegisteredCallbackException("Callback target does not 
implement the callback interface");
         }
-        return next.invoke(msg);
     }
 
     public void setNext(Invoker next) {



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

Reply via email to