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 3.0.x Jose code
Date Mon, 14 Mar 2016 22:28:36 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes b1bac442f -> 526842c9a


Fixing 3.0.x Jose code


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

Branch: refs/heads/3.0.x-fixes
Commit: 526842c9a5f213dfae2bcfa1677b12842d60fcd2
Parents: b1bac44
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Mon Mar 14 22:28:11 2016 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Mon Mar 14 22:28:11 2016 +0000

----------------------------------------------------------------------
 .../cxf/rs/security/jose/jaxrs/JweJsonWriterInterceptor.java     | 2 +-
 .../main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/526842c9/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweJsonWriterInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweJsonWriterInterceptor.java
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweJsonWriterInterceptor.java
index 89ce053..939df7a 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweJsonWriterInterceptor.java
+++ b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweJsonWriterInterceptor.java
@@ -67,7 +67,7 @@ public class JweJsonWriterInterceptor extends AbstractJweJsonWriterProvider
impl
         if (ctString != null) {
             protectedHeaders.setContentType(ctString);
         }
-        List<KeyAlgorithm> keyAlgos = new ArrayList<>();
+        List<KeyAlgorithm> keyAlgos = new ArrayList<KeyAlgorithm>();
         for (JweEncryptionProvider p : providers) {
             if (!keyAlgos.contains(p.getKeyAlgorithm())) {
                 keyAlgos.add(p.getKeyAlgorithm());    

http://git-wip-us.apache.org/repos/asf/cxf/blob/526842c9/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
index ccfbfdc..869f7c4 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java
@@ -439,7 +439,7 @@ public final class JweUtils {
     }
     public static List<JweEncryptionProvider> loadJweEncryptionProviders(String propLoc,
Message m) {
         Properties props = loadJweProperties(m, propLoc);
-        JweEncryptionProvider theEncProvider = loadEncryptionProvider(props, null, false);
+        JweEncryptionProvider theEncProvider = loadEncryptionProvider(null, false);
         if (theEncProvider != null) {
             return Collections.singletonList(theEncProvider);
         }
@@ -461,7 +461,7 @@ public final class JweUtils {
     }
     public static List<JweDecryptionProvider> loadJweDecryptionProviders(String propLoc,
Message m) {
         Properties props = loadJweProperties(m, propLoc);
-        JweDecryptionProvider theDecProvider = loadDecryptionProvider(props, null, false);
+        JweDecryptionProvider theDecProvider = loadDecryptionProvider(null, false);
         if (theDecProvider != null) {
             return Collections.singletonList(theDecProvider);
         }


Mime
View raw message