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:12 UTC
svn commit: r1342364 - in
/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering:
FailoverFeature.java FailoverTargetSelector.java
Author: dkulp
Date: Thu May 24 18:30:12 2012
New Revision: 1342364
URL: http://svn.apache.org/viewvc?rev=1342364&view=rev
Log:
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.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverFeature.java?rev=1342364&r1=1342363&r2=1342364&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverFeature.java (original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/clustering/FailoverFeature.java Thu May 24 18:30:12 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.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=1342364&r1=1342363&r2=1342364&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 May 24 18:30:12 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;
+ }
}
/**