Author: dkulp
Date: Thu May 27 17:13:38 2010
New Revision: 948914
URL: http://svn.apache.org/viewvc?rev=948914&view=rev
Log:
Put a NPE guard in place
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=948914&r1=948913&r2=948914&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
Thu May 27 17:13:38 2010
@@ -121,8 +121,9 @@ public class IssuedTokenInterceptorProvi
if (maps == null) {
tok = client.requestSecurityToken();
} else {
- String s = message
-
.getContextualProperty(SecurityConstants.STS_APPLIES_TO).toString();
+ Object o = message
+
.getContextualProperty(SecurityConstants.STS_APPLIES_TO);
+ String s = o == null ? null : o.toString();
s = s == null
?
message.getContextualProperty(Message.ENDPOINT_ADDRESS).toString()
: s;