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 133BB10DE1 for ; Fri, 30 Aug 2013 12:59:25 +0000 (UTC) Received: (qmail 39776 invoked by uid 500); 30 Aug 2013 12:59:25 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 39707 invoked by uid 500); 30 Aug 2013 12:59:24 -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 39700 invoked by uid 99); 30 Aug 2013 12:59:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Aug 2013 12:59: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; Fri, 30 Aug 2013 12:59:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9D5A923888E7; Fri, 30 Aug 2013 12:59:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1518958 - /cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java Date: Fri, 30 Aug 2013 12:59:00 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130830125900.9D5A923888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Fri Aug 30 12:59:00 2013 New Revision: 1518958 URL: http://svn.apache.org/r1518958 Log: Minor update to JAXRSInvoker on CXF 2.7.x Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java?rev=1518958&r1=1518957&r2=1518958&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java Fri Aug 30 12:59:00 2013 @@ -109,12 +109,10 @@ public class JAXRSInvoker extends Abstra if (exchange.isOneWay() || suspended) { ProviderFactory.getInstance(exchange.getInMessage()).clearThreadLocalProxies(); } - if (!suspended) { - if (!isServiceObjectRequestScope(exchange.getInMessage())) { - provider.releaseInstance(exchange.getInMessage(), rootInstance); - } + if (!suspended && !isServiceObjectRequestScope(exchange.getInMessage())) { + provider.releaseInstance(exchange.getInMessage(), rootInstance); } else { - exchange.put(REQUEST_WAS_SUSPENDED, true); + exchange.put(REQUEST_WAS_SUSPENDED, suspended); persistRoots(exchange, rootInstance, provider); } }