You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/08/30 14:59:00 UTC
svn commit: r1518958 -
/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
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);
}
}