cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: Preventing NPE in a JWE test
Date Wed, 17 Sep 2014 12:22:48 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes ad4687c7a -> 0885ab9c1


Preventing NPE in a JWE test


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

Branch: refs/heads/3.0.x-fixes
Commit: 0885ab9c1e8e11a217214473255bfae817c92261
Parents: ad4687c
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Wed Sep 17 13:20:51 2014 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Wed Sep 17 13:22:23 2014 +0100

----------------------------------------------------------------------
 .../cxf/rs/security/oauth2/jwe/JweCompactReaderWriterTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/0885ab9c/rt/rs/security/oauth-parent/oauth2-jwt/src/test/java/org/apache/cxf/rs/security/oauth2/jwe/JweCompactReaderWriterTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2-jwt/src/test/java/org/apache/cxf/rs/security/oauth2/jwe/JweCompactReaderWriterTest.java
b/rt/rs/security/oauth-parent/oauth2-jwt/src/test/java/org/apache/cxf/rs/security/oauth2/jwe/JweCompactReaderWriterTest.java
index a540ee6..ef70a39 100644
--- a/rt/rs/security/oauth-parent/oauth2-jwt/src/test/java/org/apache/cxf/rs/security/oauth2/jwe/JweCompactReaderWriterTest.java
+++ b/rt/rs/security/oauth-parent/oauth2-jwt/src/test/java/org/apache/cxf/rs/security/oauth2/jwe/JweCompactReaderWriterTest.java
@@ -175,7 +175,7 @@ public class JweCompactReaderWriterTest extends Assert {
         }
         JweEncryptionProvider encryptor = new WrappedKeyJweEncryption(
                                                         new JweHeaders(Algorithm.RSA_OAEP.getJwtName(),
jwtKeyName),  
-                                                        key.getEncoded(), 
+                                                        key == null ? null : key.getEncoded(),

                                                         INIT_VECTOR_A1,
                                                         new RSAOaepKeyEncryptionAlgorithm(publicKey,

                                                             Algorithm.RSA_OAEP.getJwtName()));


Mime
View raw message