Author: sergeyb
Date: Fri Feb 12 14:54:07 2010
New Revision: 909442
URL: http://svn.apache.org/viewvc?rev=909442&view=rev
Log:
Merged revisions 909411 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r909411 | sergeyb | 2010-02-12 13:49:16 +0000 (Fri, 12 Feb 2010) | 1 line
JAXRS : fixing the context leakage in shared providers
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 14:54:07 2010
@@ -1 +1 @@
-/cxf/trunk:908451,909102,909396
+/cxf/trunk:908451,909102,909396,909411
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java?rev=909442&r1=909441&r2=909442&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
Fri Feb 12 14:54:07 2010
@@ -581,6 +581,9 @@
requestHandlers,
responseHandlers,
exceptionMappers);
+ if (this != SHARED_FACTORY) {
+ SHARED_FACTORY.clearThreadLocalProxies();
+ }
}
void clearProxies(List<?> ...lists) {
