cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/4] cxf git commit: Fall back to use the altPropname if "out/in" is not added
Date Mon, 27 Apr 2015 15:40:04 GMT
Repository: cxf
Updated Branches:
  refs/heads/master c4aac43ff -> e00159949


Fall back to use the altPropname if "out/in" is not added


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

Branch: refs/heads/master
Commit: dda892a3d666550d94dfb6d17340d7b3e7c7f091
Parents: 3f719f9
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Apr 27 16:09:15 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Apr 27 16:39:58 2015 +0100

----------------------------------------------------------------------
 .../apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java    | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/dda892a3/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
index 799a0c1..c525a69 100644
--- a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
+++ b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/KeyManagementUtils.java
@@ -167,6 +167,10 @@ public final class KeyManagementUtils {
             }
             String direction = m.getExchange().getOutMessage() == m ? ".out" : ".in";
             kid = (String)MessageUtils.getContextualProperty(m, preferredPropertyName, altPropertyName
+ direction);
+            // Check whether the direction is not set for the altPropertyName
+            if (kid == null && altPropertyName != null) {
+                kid = (String)m.getContextualProperty(altPropertyName);
+            }
         }
         
         if (kid == null) {


Mime
View raw message