cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1342441 - in /cxf/branches/2.4.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/clustering/FailoverFeature.java rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
Date Thu, 24 May 2012 21:37:23 GMT
Author: dkulp
Date: Thu May 24 21:37:23 2012
New Revision: 1342441

URL: http://svn.apache.org/viewvc?rev=1342441&view=rev
Log:
Merged revisions 1342364 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1342364 | dkulp | 2012-05-24 14:30:12 -0400 (Thu, 24 May 2012) | 9 lines
  
  Merged revisions 1340904 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1340904 | ningjiang | 2012-05-21 02:59:00 -0400 (Mon, 21 May 2012) | 2 lines
  
    clean up the codes of FailoverFeature
  
  ........
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
    cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java

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

Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverFeature.java?rev=1342441&r1=1342440&r2=1342441&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
Thu May 24 21:37:23 2012
@@ -44,7 +44,9 @@ public class FailoverFeature extends Abs
     protected ConduitSelector initTargetSelector(Endpoint endpoint) {
         FailoverTargetSelector selector = getTargetSelector();
         selector.setEndpoint(endpoint);
-        selector.setStrategy(getStrategy());
+        if (getStrategy() != null) {
+            selector.setStrategy(getStrategy());
+        }
         return selector;
     }
     

Modified: cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java?rev=1342441&r1=1342440&r2=1342441&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
Thu May 24 21:37:23 2012
@@ -167,8 +167,10 @@ public class FailoverTargetSelector exte
      * @param strategy the FailoverStrategy to use
      */
     public synchronized void setStrategy(FailoverStrategy strategy) {
-        getLogger().log(Level.INFO, "USING_STRATEGY", new Object[] {strategy});
-        failoverStrategy = strategy;
+        if (strategy != null) {
+            getLogger().log(Level.INFO, "USING_STRATEGY", new Object[] {strategy});
+            failoverStrategy = strategy;
+        }
     }
     
     /**



Mime
View raw message