cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: Fixing build error with JDK6
Date Fri, 10 Jul 2015 13:51:48 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes a68344edc -> 6304eb5a5


Fixing build error with JDK6


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

Branch: refs/heads/3.0.x-fixes
Commit: 6304eb5a5a35e613d6d7a496267931ac1f4dbe47
Parents: a68344e
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jul 10 14:51:18 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jul 10 14:51:30 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/6304eb5a/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
b/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
index ec6319d..580c886 100644
--- a/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
+++ b/rt/rs/security/jose/src/test/java/org/apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java
@@ -162,7 +162,7 @@ public class JweJsonConsumerTest extends Assert {
                                        ContentAlgorithm contentEncryptionAlgo,
                                        final byte[] wrapperKeyBytes,
                                        final byte[] cek) throws Exception {
-        if (contentEncryptionAlgo.equals(AlgorithmUtils.A128GCM_ALGO) && SKIP_AES_GCM_TESTS)
{
+        if (AlgorithmUtils.A128GCM_ALGO.equals(contentEncryptionAlgo.getJwaName()) &&
SKIP_AES_GCM_TESTS) {
             return;
         }
         JweDecryptionProvider jwe = null;


Mime
View raw message