cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Fixing a 3.0.x build failure
Date Thu, 12 Feb 2015 22:02:31 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 74c78e78a -> 34740261e


Fixing a 3.0.x build failure


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

Branch: refs/heads/3.0.x-fixes
Commit: 34740261e05c177014826d822646d5e76428985b
Parents: 74c78e7
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Thu Feb 12 22:02:03 2015 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Thu Feb 12 22:02:03 2015 +0000

----------------------------------------------------------------------
 .../org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/34740261/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
b/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
index 3ecdacf..83ce452 100644
--- a/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
+++ b/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java
@@ -146,7 +146,7 @@ public class JweJsonProducerTest extends Assert {
                                          final byte[] cek,
                                          boolean canBeFlat) throws Exception {
         if (contentEncryptionAlgo.equals(JoseConstants.A128GCM_ALGO) && SKIP_AES_GCM_TESTS)
{
-            return;
+            return null;
         }
         SecretKey wrapperKey = CryptoUtils.createSecretKeySpec(wrapperKeyBytes, "AES");
         JweHeaders headers = new JweHeaders(JoseConstants.A128KW_ALGO,


Mime
View raw message