You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/05/24 23:44:39 UTC
svn commit: r1342449 - in /cxf/branches/2.3.x-fixes: ./
api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
Author: dkulp
Date: Thu May 24 21:44:39 2012
New Revision: 1342449
URL: http://svn.apache.org/viewvc?rev=1342449&view=rev
Log:
Merged revisions 1342443 via svn merge from
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
........
r1342443 | dkulp | 2012-05-24 17:37:58 -0400 (Thu, 24 May 2012) | 18 lines
Merged revisions 1342365 via svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........
r1342365 | dkulp | 2012-05-24 14:30:16 -0400 (Thu, 24 May 2012) | 10 lines
Merged revisions 1342034 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1342034 | dkulp | 2012-05-23 16:35:49 -0400 (Wed, 23 May 2012) | 3 lines
[CXF-4315] Selecting the conduit can cause extra properties to be set on the
endpoint, make sure we reset the cache in such cases.
........
........
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java?rev=1342449&r1=1342448&r2=1342449&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java (original)
+++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java Thu May 24 21:44:39 2012
@@ -102,6 +102,8 @@ public abstract class AbstractConduitSel
} catch (IOException ex) {
throw new Fault(ex);
}
+ //the search for the conduit could cause extra properties to be reset/loaded.
+ message.resetContextCache();
}
return selectedConduit;
}