svn commit: r1073056 - /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java

[da...@apache.org]

Author: davsclaus
Date: Mon Feb 21 16:38:06 2011
New Revision: 1073056

URL: http://svn.apache.org/viewvc?rev=1073056&view=rev
Log:
CAMEL-3694: Do not use CXF continuation if option is disabled

Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java?rev=1073056&r1=1073055&r2=1073056&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java Mon Feb 21 16:38:06 2011
@@ -54,9 +54,9 @@ public class CxfRsInvoker extends JAXRSI
             // don't delegate the sub resource locator call to camel processor
             return method.invoke(serviceObject, paramArray);
         }
-        Continuation continuation = getContinuation(cxfExchange);
-        // Only calling the continuation API for CXF 2.3.x 
-        if (continuation != null && !endpoint.isSynchronous() && Version.getCurrentVersion().startsWith("2.3")) {
+        Continuation continuation;
+        if (!endpoint.isSynchronous() && (continuation = getContinuation(cxfExchange)) != null && Version.getCurrentVersion().startsWith("2.3")) {
+            // Only calling the continuation API for CXF 2.3.x
             return asyncInvoke(cxfExchange, serviceObject, method, paramArray, continuation);
         } else {
             return syncInvoke(cxfExchange, serviceObject, method, paramArray);