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 2012/01/25 22:41:36 UTC
svn commit: r1235966 - in /cxf/branches/2.4.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
Author: sergeyb
Date: Wed Jan 25 21:41:36 2012
New Revision: 1235966
URL: http://svn.apache.org/viewvc?rev=1235966&view=rev
Log:
Merged revisions 1235848 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................
r1235848 | sergeyb | 2012-01-25 17:34:18 +0000 (Wed, 25 Jan 2012) | 9 lines
Merged revisions 1235844 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1235844 | sergeyb | 2012-01-25 17:32:46 +0000 (Wed, 25 Jan 2012) | 1 line
[CXF-4006] Fixing a regression leak in JAXB providers
........
................
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 25 21:41:36 2012
@@ -1,2 +1,2 @@
-/cxf/branches/2.5.x-fixes:1235547,1235731
-/cxf/trunk:1235544,1235730
+/cxf/branches/2.5.x-fixes:1235547,1235731,1235848
+/cxf/trunk:1235544,1235730,1235844
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java?rev=1235966&r1=1235965&r2=1235966&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java Wed Jan 25 21:41:36 2012
@@ -676,6 +676,8 @@ public final class ProviderFactory {
public void clearThreadLocalProxies() {
clearProxies(messageReaders,
messageWriters,
+ jaxbReaders,
+ jaxbWriters,
contextResolvers,
requestHandlers,
responseHandlers,