svn commit: r948915 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java

[dkulp]

Author: dkulp
Date: Thu May 27 17:17:22 2010
New Revision: 948915

URL: http://svn.apache.org/viewvc?rev=948915&view=rev
Log:
Merged revisions 948914 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r948914 | dkulp | 2010-05-27 13:13:38 -0400 (Thu, 27 May 2010) | 1 line
  
  Put a NPE guard in place
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 27 17:17:22 2010
@@ -1 +1 @@
-/cxf/trunk:948907
+/cxf/trunk:948907,948914

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java?rev=948915&r1=948914&r2=948915&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/IssuedTokenInterceptorProvider.java
 Thu May 27 17:17:22 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;