Repository: cxf Updated Branches: refs/heads/3.0.x-fixes ccac433d0 -> e5ac7504f
Avoiding NPE in JwsJwtCompactproducer Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e5ac7504 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e5ac7504 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e5ac7504 Branch: refs/heads/3.0.x-fixes Commit: e5ac7504f83cf9ee2efef04ca1d04149000a063c Parents: ccac433 Author: Sergey Beryozkin <[email protected]> Authored: Wed Oct 28 14:58:39 2015 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Oct 28 14:59:37 2015 +0000 ---------------------------------------------------------------------- .../apache/cxf/rs/security/jose/jwe/JweJwtCompactProducer.java | 2 +- .../apache/cxf/rs/security/jose/jws/JwsJwtCompactProducer.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e5ac7504/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactProducer.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactProducer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactProducer.java index 5b65790..f52f9e2 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactProducer.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactProducer.java @@ -38,7 +38,7 @@ public class JweJwtCompactProducer { this(new JweHeaders(), claims); } public JweJwtCompactProducer(JweHeaders joseHeaders, JwtClaims claims) { - headers = new JweHeaders(joseHeaders); + headers = joseHeaders; claimsJson = JwtUtils.claimsToJson(claims); } http://git-wip-us.apache.org/repos/asf/cxf/blob/e5ac7504/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJwtCompactProducer.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJwtCompactProducer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJwtCompactProducer.java index beaa598..3ac6021 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJwtCompactProducer.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJwtCompactProducer.java @@ -17,7 +17,6 @@ * under the License. */ package org.apache.cxf.rs.security.jose.jws; -import org.apache.cxf.rs.security.jose.common.JoseHeaders; import org.apache.cxf.rs.security.jose.jwt.JwtClaims; import org.apache.cxf.rs.security.jose.jwt.JwtToken; import org.apache.cxf.rs.security.jose.jwt.JwtTokenReaderWriter; @@ -30,9 +29,9 @@ public class JwsJwtCompactProducer extends JwsCompactProducer { this(token, null); } public JwsJwtCompactProducer(JwtClaims claims) { - this(new JwtToken(null, claims), null); + this(new JwsHeaders(), claims); } - public JwsJwtCompactProducer(JoseHeaders headers, JwtClaims claims) { + public JwsJwtCompactProducer(JwsHeaders headers, JwtClaims claims) { this(new JwtToken(headers, claims), null); } protected JwsJwtCompactProducer(JwtToken token, JwtTokenReaderWriter w) {
