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/08/15 13:13:58 UTC
svn commit: r1514234 - in /cxf/branches/2.6.x-fixes: ./
rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
Author: sergeyb
Date: Thu Aug 15 11:13:58 2013
New Revision: 1514234
URL: http://svn.apache.org/r1514234
Log:
Merged revisions 1514230 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................
r1514230 | sergeyb | 2013-08-15 13:38:09 +0300 (Thu, 15 Aug 2013) | 9 lines
Merged revisions 1514018 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1514018 | sergeyb | 2013-08-14 22:49:20 +0300 (Wed, 14 Aug 2013) | 1 line
[CXF-5185] NPE guard in FailoverTargetSelector
........
................
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.7.x-fixes:r1514230
Merged /cxf/trunk:r1514018
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java?rev=1514234&r1=1514233&r2=1514234&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java (original)
+++ cxf/branches/2.6.x-fixes/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java Thu Aug 15 11:13:58 2013
@@ -392,16 +392,18 @@ public class FailoverTargetSelector exte
}
Endpoint retrieveOriginalEndpoint(Endpoint endpoint) {
- if (endpoint != originalEndpoint) {
- getLogger().log(Level.INFO,
- "REVERT_TO_ORIGINAL_TARGET",
- endpoint.getEndpointInfo().getName());
- }
- if (!endpoint.getEndpointInfo().getAddress().equals(originalAddress)) {
- endpoint.getEndpointInfo().setAddress(originalAddress);
- getLogger().log(Level.INFO,
- "REVERT_TO_ORIGINAL_ADDRESS",
- endpoint.getEndpointInfo().getAddress());
+ if (endpoint != null) {
+ if (endpoint != originalEndpoint) {
+ getLogger().log(Level.INFO,
+ "REVERT_TO_ORIGINAL_TARGET",
+ endpoint.getEndpointInfo().getName());
+ }
+ if (!endpoint.getEndpointInfo().getAddress().equals(originalAddress)) {
+ endpoint.getEndpointInfo().setAddress(originalAddress);
+ getLogger().log(Level.INFO,
+ "REVERT_TO_ORIGINAL_ADDRESS",
+ endpoint.getEndpointInfo().getAddress());
+ }
}
return originalEndpoint;
}