cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: More Jose build fixes
Date Tue, 15 Mar 2016 12:09:21 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes a85eb88e8 -> 1933ae27d


More Jose build fixes


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

Branch: refs/heads/3.0.x-fixes
Commit: 1933ae27d0cf5d2660fe7df9f7b48d10ec3cc7c3
Parents: a85eb88
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Mar 15 12:09:09 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Mar 15 12:09:09 2016 +0000

----------------------------------------------------------------------
 .../rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/1933ae27/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
index 8bfc807..c09bafc 100644
--- a/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
+++ b/rt/rs/security/jose-parent/jose-jaxrs/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/AbstractJweJsonDecryptingFilter.java
@@ -20,7 +20,6 @@ package org.apache.cxf.rs.security.jose.jaxrs;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 import org.apache.cxf.helpers.IOUtils;
@@ -39,7 +38,7 @@ public class AbstractJweJsonDecryptingFilter {
     private Map<String, Object> recipientProperties;
     protected JweDecryptionOutput decrypt(InputStream is) throws IOException {
         JweJsonConsumer c = new JweJsonConsumer(new String(IOUtils.readBytesFromStream(is),

-                                                                   StandardCharsets.UTF_8));
+                                                                   "UTF-8"));
         JweDecryptionProvider theProvider = getInitializedDecryptionProvider(c.getProtectedHeader());
         JweJsonEncryptionEntry entry = c.getJweDecryptionEntry(theProvider, recipientProperties);
         if (entry == null) {


Mime
View raw message