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 2013/05/10 18:37:37 UTC
svn commit: r1481085 -
/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Author: coheigea
Date: Fri May 10 16:37:37 2013
New Revision: 1481085
URL: http://svn.apache.org/r1481085
Log:
[CXF-5011] - Fix NPE in WSS4JInterceptor
Modified:
cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1481085&r1=1481084&r2=1481085&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original)
+++ cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Fri May 10 16:37:37 2013
@@ -593,7 +593,7 @@ public class WSS4JInInterceptor extends
|| WSConstants.WSS_KRB_KI_VALUE_TYPE.equals(pc.getType())) {
for (String tokenId : store.getTokenIdentifiers()) {
SecurityToken token = store.getToken(tokenId);
- if (id.equals(token.getSHA1())) {
+ if (token != null && id.equals(token.getSHA1())) {
pc.setKey(token.getSecret());
return;
}