You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/09/17 14:21:17 UTC
git commit: Preventing NPE in a JWE test
Repository: cxf
Updated Branches:
refs/heads/master 30529297e -> 1fa008dd1
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/1fa008dd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1fa008dd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1fa008dd
Branch: refs/heads/master
Commit: 1fa008dd160dde9c4d614700556ba9f0d8f17fdd
Parents: 3052929
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Wed Sep 17 13:20:51 2014 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Wed Sep 17 13:20:51 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/1fa008dd/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()));