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 20:30:16 UTC

svn commit: r1342365 - /cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java

Author: dkulp
Date: Thu May 24 18:30:16 2012
New Revision: 1342365

URL: http://svn.apache.org/viewvc?rev=1342365&view=rev
Log:
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.5.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java

Modified: cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java?rev=1342365&r1=1342364&r2=1342365&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java (original)
+++ cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java Thu May 24 18:30:16 2012
@@ -112,6 +112,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;
     }