cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: Minor update
Date Wed, 11 Jun 2014 16:08:46 GMT
Repository: cxf
Updated Branches:
  refs/heads/master bbeddfc82 -> 8447da0da


Minor update


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

Branch: refs/heads/master
Commit: 8447da0da822db71c3b48f64eced15c7b4701b34
Parents: bbeddfc
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Wed Jun 11 17:08:31 2014 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Wed Jun 11 17:08:31 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/cxf/blob/8447da0d/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryptor.java
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryptor.java
index 5805ebb..316d091 100644
--- a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryptor.java
+++ b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryptor.java
@@ -81,7 +81,7 @@ public abstract class AbstractJweEncryptor implements JweEncryptor {
         return headers.getContentEncryptionAlgorithm();
     }
     protected String getContentEncryptionAlgoJava() {
-        return Algorithm.toJavaName(headers.getContentEncryptionAlgorithm());
+        return Algorithm.toJavaName(getContentEncryptionAlgoJwt());
     }
     
     protected int getAuthTagLen() {


Mime
View raw message