cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1441082 - in /cxf/branches/2.5.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java
Date Thu, 31 Jan 2013 17:35:18 GMT
Author: sergeyb
Date: Thu Jan 31 17:35:17 2013
New Revision: 1441082

URL: http://svn.apache.org/viewvc?rev=1441082&view=rev
Log:
Merged revisions 1441060 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

................
  r1441060 | sergeyb | 2013-01-31 16:53:36 +0000 (Thu, 31 Jan 2013) | 16 lines
  
  Merged revisions 1441057 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
  
  ................
    r1441057 | sergeyb | 2013-01-31 16:49:12 +0000 (Thu, 31 Jan 2013) | 9 lines
    
    Merged revisions 1441034 via svnmerge from 
    https://svn.apache.org/repos/asf/cxf/trunk
    
    ........
      r1441034 | sergeyb | 2013-01-31 16:03:18 +0000 (Thu, 31 Jan 2013) | 1 line
      
      [CXF-4796] Minor updates to protect against NPE when conduit is accessed on JAX-RS ClientConfiguration
in the failover mode
    ........
  ................
................

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
    cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jan 31 17:35:17 2013
@@ -0,0 +1,3 @@
+/cxf/branches/2.6.x-fixes:1441060
+/cxf/branches/2.7.x-fixes:1441057
+/cxf/trunk:1441034

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

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java?rev=1441082&r1=1441081&r2=1441082&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
Thu Jan 31 17:35:17 2013
@@ -74,6 +74,9 @@ public class FailoverTargetSelector exte
      * @param message the current Message
      */
     public synchronized void prepare(Message message) {
+        if (message.getContent(List.class) == null) {
+            return;
+        }
         Exchange exchange = message.getExchange();
         InvocationKey key = new InvocationKey(exchange);
         if (!inProgress.containsKey(key)) {

Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java?rev=1441082&r1=1441081&r2=1441082&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientConfiguration.java
Thu Jan 31 17:35:17 2013
@@ -27,6 +27,7 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
 import org.apache.cxf.endpoint.ConduitSelector;
+import org.apache.cxf.endpoint.Endpoint;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.InterceptorProvider;
@@ -167,6 +168,9 @@ public class ClientConfiguration impleme
         Exchange exchange = new ExchangeImpl();
         message.setExchange(exchange);
         exchange.put(MessageObserver.class, new ClientMessageObserver(this));
+        if (conduitSelector != null) {
+            exchange.put(Endpoint.class, conduitSelector.getEndpoint());
+        }
         exchange.put(Bus.class, bus);
         prepareConduitSelector(message);
         return getConduitSelector().selectConduit(message);



Mime
View raw message