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 B369BE99E for ; Mon, 18 Mar 2013 21:24:23 +0000 (UTC) Received: (qmail 57537 invoked by uid 500); 18 Mar 2013 21:24:23 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 57493 invoked by uid 500); 18 Mar 2013 21:24:23 -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 57486 invoked by uid 99); 18 Mar 2013 21:24:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2013 21:24:23 +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; Mon, 18 Mar 2013 21:24:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 71658238897A; Mon, 18 Mar 2013 21:24:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1458011 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java Date: Mon, 18 Mar 2013 21:24:00 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130318212400.71658238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Mon Mar 18 21:24:00 2013 New Revision: 1458011 URL: http://svn.apache.org/r1458011 Log: Merged revisions 1458005 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1458005 | sergeyb | 2013-03-18 21:17:49 +0000 (Mon, 18 Mar 2013) | 1 line Setting REST_MESSAGE exchange property at the top of JAXRSInInterceptor ........ Modified: cxf/branches/2.7.x-fixes/ (props changed) cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1458005 Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java?rev=1458011&r1=1458010&r2=1458011&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java Mon Mar 18 21:24:00 2013 @@ -93,6 +93,7 @@ public class JAXRSInInterceptor extends // it's a suspended invocation; return; } + message.getExchange().put(Message.REST_MESSAGE, Boolean.TRUE); try { processRequest(message); @@ -250,7 +251,6 @@ public class JAXRSInInterceptor extends private void setExchangeProperties(Message message, OperationResourceInfo ori, MultivaluedMap values, int numberOfResources) { - message.getExchange().put(Message.REST_MESSAGE, Boolean.TRUE); message.getExchange().put(OperationResourceInfo.class, ori); message.put(RESOURCE_METHOD, ori.getMethodToInvoke()); message.put(URITemplate.TEMPLATE_PARAMETERS, values);