You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/06/16 16:58:34 UTC
git commit: Fixing build
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes eed07c1cf -> 736028517
Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/73602851
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/73602851
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/73602851
Branch: refs/heads/2.7.x-fixes
Commit: 736028517089bc76cd86219e1470f7a3df972c64
Parents: eed07c1
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jun 16 15:58:23 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jun 16 15:58:23 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/73602851/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index c06cfeb..81282a4 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -537,8 +537,6 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
}
EndpointInfo ei = service.getEndpointInfo(endpointName);
-<<<<<<< HEAD
-=======
if (ei == null && anonymousAddress.equals(location)
&& !services.isEmpty() && !services.get(0).getEndpoints().isEmpty()) {
serviceName = services.get(0).getName();
@@ -549,7 +547,6 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
if (location != null && !anonymousAddress.equals(location)) {
ei.setAddress(location);
}
->>>>>>> da25b2a... [CXF-5807] - Fix STSClient configuration when Issuer EPR has an "anonymous" address
Endpoint endpoint = new EndpointImpl(bus, service, ei);
client = new ClientImpl(bus, endpoint);
}