cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [4/4] cxf git commit: Fixing merge
Date Mon, 12 Oct 2015 16:27:02 GMT
Fixing merge


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

Branch: refs/heads/3.0.x-fixes
Commit: 191fbf01488c1bff9603a1196f65aaa859ee3178
Parents: e474a7b
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Oct 12 17:26:49 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Oct 12 17:26:49 2015 +0100

----------------------------------------------------------------------
 .../cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/191fbf01/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
index 3c68633..1cc56c46 100644
--- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
+++ b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JwtAuthenticationFilter.java
@@ -45,11 +45,8 @@ public class JwtAuthenticationFilter extends AbstractJoseJwtConsumer implements
     private static final String DEFAULT_AUTH_SCHEME = "JWT";
     private String expectedAuthScheme = DEFAULT_AUTH_SCHEME;
     private int clockOffset;
-<<<<<<< HEAD
     private int ttl;
-=======
     private String roleClaim;
->>>>>>> d2d8f6d... Allow role processing from JWT tokens
     
     @Override
     public void filter(ContainerRequestContext requestContext) throws IOException {
@@ -97,7 +94,6 @@ public class JwtAuthenticationFilter extends AbstractJoseJwtConsumer implements
     public void setClockOffset(int clockOffset) {
         this.clockOffset = clockOffset;
     }
-<<<<<<< HEAD
 
     public int getTtl() {
         return ttl;
@@ -105,7 +101,7 @@ public class JwtAuthenticationFilter extends AbstractJoseJwtConsumer implements
 
     public void setTtl(int ttl) {
         this.ttl = ttl;
-=======
+    }
     
     public String getRoleClaim() {
         return roleClaim;
@@ -113,6 +109,5 @@ public class JwtAuthenticationFilter extends AbstractJoseJwtConsumer implements
 
     public void setRoleClaim(String roleClaim) {
         this.roleClaim = roleClaim;
->>>>>>> d2d8f6d... Allow role processing from JWT tokens
     }
 }


Mime
View raw message