cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] cxf git commit: Fixing backmerge
Date Tue, 26 May 2015 13:06:14 GMT
Fixing backmerge


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

Branch: refs/heads/3.0.x-fixes
Commit: c175b954a3160e42ba106ff654e0e7b98bc1223a
Parents: 764641f
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue May 26 14:06:03 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue May 26 14:06:03 2015 +0100

----------------------------------------------------------------------
 .../cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/c175b954/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
index 7f4790e..a7d7ccd 100644
--- a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
+++ b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
@@ -46,8 +46,7 @@ public class XkmsCryptoProviderFactory implements CryptoProviderFactory
{
 
     @Override
     public Crypto create(Message message) {
-        Object crypto = 
-            SecurityUtils.getSecurityPropertyValue(SecurityConstants.SIGNATURE_CRYPTO, message);
+        Object crypto = message.getContextualProperty(SecurityConstants.SIGNATURE_CRYPTO);
         if (crypto instanceof Crypto) {
             new XkmsCryptoProvider(xkmsConsumer, (Crypto)crypto);
         }


Mime
View raw message