cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/5] git commit: Avoiding NPE if either a location/wsdlLocation is not configured on the STSClient
Date Thu, 26 Jun 2014 15:16:59 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.6.x-fixes 9085c8578 -> 5ef5d91a8


Avoiding NPE if either a location/wsdlLocation is not configured on the STSClient

Conflicts:
	rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties


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

Branch: refs/heads/2.6.x-fixes
Commit: 33d66d09609196f763524474645e49e0d0136153
Parents: 9085c85
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Jun 26 11:10:49 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Jun 26 16:06:36 2014 +0100

----------------------------------------------------------------------
 .../org/apache/cxf/ws/security/trust/AbstractSTSClient.java    | 4 +++-
 .../java/org/apache/cxf/ws/security/trust/Messages.properties  | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/33d66d09/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 5c7e711..5ce96c7 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
@@ -559,11 +559,13 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
             EndpointInfo ei = service.getEndpointInfo(endpointName);
             Endpoint endpoint = new EndpointImpl(bus, service, ei);
             client = new ClientImpl(bus, endpoint);
-        } else {
+        } else if (location != null) {
             Endpoint endpoint = STSUtils.createSTSEndpoint(bus, namespace, null, location,
soapVersion,
                                                            policy, endpointName);
 
             client = new ClientImpl(bus, endpoint);
+        } else {
+            throw new TrustException(LOG, "NO_LOCATION");
         }
         
         client.getInFaultInterceptors().addAll(inFault);

http://git-wip-us.apache.org/repos/asf/cxf/blob/33d66d09/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
index dddcc67..94193fb 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/Messages.properties
@@ -25,3 +25,9 @@ DERIVED_KEY_ERROR=Exception while trying to create secret key from RequestSecuri
 ENCRYPTED_KEY_ERROR=Exception while trying to decrypt key from RequestSecurityTokenResponse
 VALIDATION_FAILED=Validation of security token failed: {0}
 NO_USER_PASSWORD=No user name and/or password is available, name: {0}, password: {1}
+<<<<<<< HEAD
+=======
+ADDRESS_NOT_MATCHED=Cannot match the address {0} to the WSDL received via WS-MEX
+WS_MEX_ERROR=Exception when trying to retrieve/process a WSDL via WS-MEX
+NO_LOCATION=The STSClient is not configured with either a location or wsdlLocation property
+>>>>>>> 0c0e20a... Avoiding NPE if either a location/wsdlLocation is
not configured on the STSClient


Mime
View raw message