cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1342443 - in /cxf/branches/2.4.x-fixes: ./ api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
Date Thu, 24 May 2012 21:37:58 GMT
Author: dkulp
Date: Thu May 24 21:37:58 2012
New Revision: 1342443

URL: http://svn.apache.org/viewvc?rev=1342443&view=rev
Log:
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.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java?rev=1342443&r1=1342442&r2=1342443&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
(original)
+++ cxf/branches/2.4.x-fixes/api/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
Thu May 24 21:37:58 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;
     }



Mime
View raw message