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 2013/11/14 14:10:43 UTC

svn commit: r1541896 - in /cxf/trunk: rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java

Author: sergeyb
Date: Thu Nov 14 13:10:43 2013
New Revision: 1541896

URL: http://svn.apache.org/r1541896
Log:
[CXF-5378] Failover feature should not be activated in case of transport client errors

Modified:
    cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java

Modified: cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java?rev=1541896&r1=1541895&r2=1541896&view=diff
==============================================================================
--- cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java (original)
+++ cxf/trunk/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java Thu Nov 14 13:10:43 2013
@@ -52,7 +52,7 @@ public class FailoverTargetSelector exte
     protected ConcurrentHashMap<InvocationKey, InvocationContext> inProgress 
         = new ConcurrentHashMap<InvocationKey, InvocationContext>();;
     protected FailoverStrategy failoverStrategy;
-    private boolean supportNotAvailableErrorsOnly;
+    private boolean supportNotAvailableErrorsOnly = true;
     /**
      * Normal constructor.
      */

Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java?rev=1541896&r1=1541895&r2=1541896&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/failover/FailoverTest.java Thu Nov 14 13:10:43 2013
@@ -120,13 +120,13 @@ public class FailoverTest extends Abstra
     @Test
     public void testSequentialStrategyWith406() throws Exception {
         FailoverFeature feature = getFeature(false, false, Server.ADDRESS3);
+        feature.getTargetSelector().setSupportNotAvailableErrorsOnly(false);
         strategyTestWebClientHttpError(Server.ADDRESS2, feature, Server.ADDRESS3, false);
     }
     
     @Test
     public void testSequentialStrategyWith406NoFailover() throws Exception {
         FailoverFeature feature = getFeature(false, false, Server.ADDRESS3);
-        feature.getTargetSelector().setSupportNotAvailableErrorsOnly(true);
         strategyTestWebClientHttpError(Server.ADDRESS2, feature, Server.ADDRESS3, true);
     }