cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1481090 - /cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Date Fri, 10 May 2013 16:51:04 GMT
Author: coheigea
Date: Fri May 10 16:51:04 2013
New Revision: 1481090

URL: http://svn.apache.org/r1481090
Log:
Merged revisions 1481087 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1481087 | coheigea | 2013-05-10 17:40:27 +0100 (Fri, 10 May 2013) | 10 lines

  Merged revisions 1481076 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1481076 | coheigea | 2013-05-10 17:24:49 +0100 (Fri, 10 May 2013) | 2 lines

    [CXF-5011] - Fix NPE in WSS4JInterceptor

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java

Modified: cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1481090&r1=1481089&r2=1481090&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Fri May 10 16:51:04 2013
@@ -594,7 +594,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;
                         }



Mime
View raw message