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 2014/03/04 00:02:59 UTC

git commit: Fix clustering tests

Repository: cxf
Updated Branches:
  refs/heads/master 3941fe52c -> 30d6e812d


Fix clustering tests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/30d6e812
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/30d6e812
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/30d6e812

Branch: refs/heads/master
Commit: 30d6e812d33506e64709544a532c6c78cc2dcbf3
Parents: 3941fe5
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Mar 3 18:02:49 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Mar 3 18:02:49 2014 -0500

----------------------------------------------------------------------
 .../cxf/clustering/AbstractStaticFailoverStrategy.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/30d6e812/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
index 5b2ade9..1a37296 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
@@ -144,10 +144,12 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
                              endpoint.getEndpointInfo().getAddress())) {
                         Endpoint alternate =
                             endpoint.getService().getEndpoints().get(candidate.getName());
-                        if (alternate != null && LOG.isLoggable(Level.FINE)) {
-                            LOG.log(Level.FINE,
-                                    "FAILOVER_CANDIDATE_ACCEPTED",
-                                    candidate.getName());
+                        if (alternate != null) {
+                            if (LOG.isLoggable(Level.FINE)) {
+                                LOG.log(Level.FINE,
+                                        "FAILOVER_CANDIDATE_ACCEPTED",
+                                        candidate.getName());
+                            }
                             alternates.add(alternate);
                         }
                     }


Re: git commit: Fix clustering tests

Posted by Sergey Beryozkin <sb...@gmail.com>.
Hi Dan, thanks for fixing it, I looked at my last merge yesterday, but 
did not spot it unfortunately...

Sergey
On 03/03/14 23:02, dkulp@apache.org wrote:
> Repository: cxf
> Updated Branches:
>    refs/heads/master 3941fe52c -> 30d6e812d
>
>
> Fix clustering tests
>
>
> Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/30d6e812
> Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/30d6e812
> Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/30d6e812
>
> Branch: refs/heads/master
> Commit: 30d6e812d33506e64709544a532c6c78cc2dcbf3
> Parents: 3941fe5
> Author: Daniel Kulp <dk...@apache.org>
> Authored: Mon Mar 3 18:02:49 2014 -0500
> Committer: Daniel Kulp <dk...@apache.org>
> Committed: Mon Mar 3 18:02:49 2014 -0500
>
> ----------------------------------------------------------------------
>   .../cxf/clustering/AbstractStaticFailoverStrategy.java    | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/cxf/blob/30d6e812/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
> ----------------------------------------------------------------------
> diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
> index 5b2ade9..1a37296 100644
> --- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
> +++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
> @@ -144,10 +144,12 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
>                                endpoint.getEndpointInfo().getAddress())) {
>                           Endpoint alternate =
>                               endpoint.getService().getEndpoints().get(candidate.getName());
> -                        if (alternate != null && LOG.isLoggable(Level.FINE)) {
> -                            LOG.log(Level.FINE,
> -                                    "FAILOVER_CANDIDATE_ACCEPTED",
> -                                    candidate.getName());
> +                        if (alternate != null) {
> +                            if (LOG.isLoggable(Level.FINE)) {
> +                                LOG.log(Level.FINE,
> +                                        "FAILOVER_CANDIDATE_ACCEPTED",
> +                                        candidate.getName());
> +                            }
>                               alternates.add(alternate);
>                           }
>                       }
>