Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BCCFBD76D for ; Fri, 28 Sep 2012 10:12:48 +0000 (UTC) Received: (qmail 31302 invoked by uid 500); 28 Sep 2012 10:12:48 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 31054 invoked by uid 500); 28 Sep 2012 10:12:42 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 31026 invoked by uid 99); 28 Sep 2012 10:12:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2012 10:12:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Sep 2012 10:12:38 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CB072238890D; Fri, 28 Sep 2012 10:11:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1391381 - /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java Date: Fri, 28 Sep 2012 10:11:54 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120928101154.CB072238890D@eris.apache.org> Author: sergeyb Date: Fri Sep 28 10:11:54 2012 New Revision: 1391381 URL: http://svn.apache.org/viewvc?rev=1391381&view=rev Log: [CXF-4455] Excluding AsyncResponse in client proxies Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java?rev=1391381&r1=1391380&r2=1391381&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java Fri Sep 28 10:11:54 2012 @@ -38,6 +38,7 @@ import java.util.ResourceBundle; import java.util.logging.Logger; import javax.ws.rs.client.ClientException; +import javax.ws.rs.container.AsyncResponse; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; @@ -222,8 +223,7 @@ public class ClientProxyImpl extends Abs int requestBodyParam = 0; int multipartParam = 0; for (Parameter p : parameters) { - if (p.getType() == ParameterType.CONTEXT) { - // ignore + if (isIgnorableParameter(ori, p)) { continue; } if (p.getType() == ParameterType.REQUEST_BODY) { @@ -246,6 +246,20 @@ public class ClientProxyImpl extends Abs return map; } + private static boolean isIgnorableParameter(OperationResourceInfo ori, Parameter p) { + if (p.getType() == ParameterType.CONTEXT) { + return true; + } + if (p.getType() == ParameterType.REQUEST_BODY) { + Method m = ori.getAnnotatedMethod(); + if (m != null + && m.getParameterTypes()[p.getIndex()] == AsyncResponse.class) { + return true; + } + } + return false; + } + private static int getBodyIndex(MultivaluedMap map, OperationResourceInfo ori) { List list = map.get(ParameterType.REQUEST_BODY);