cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1521879 - /cxf/branches/2.7.x-fixes/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProvider.java
Date Wed, 11 Sep 2013 14:41:50 GMT
Author: coheigea
Date: Wed Sep 11 14:41:50 2013
New Revision: 1521879

URL: http://svn.apache.org/r1521879
Log:
Merged revisions 1521878 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1521878 | coheigea | 2013-09-11 15:39:44 +0100 (Wed, 11 Sep 2013) | 2 lines

  Check local cache first for IssuerSerial

........

Modified:
    cxf/branches/2.7.x-fixes/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProvider.java

Modified: cxf/branches/2.7.x-fixes/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProvider.java?rev=1521879&r1=1521878&r2=1521879&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProvider.java
(original)
+++ cxf/branches/2.7.x-fixes/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProvider.java
Wed Sep 11 14:41:50 2013
@@ -162,8 +162,14 @@ public class XkmsCryptoProvider extends 
         } else if (type == TYPE.ALIAS) {
             return getX509CertificatesFromXKMS(cryptoType);
         } else if (type == TYPE.ISSUER_SERIAL) {
+            // Try local Crypto first
+            X509Certificate[] localCerts = getCertificateLocally(cryptoType);
+            if (localCerts != null) {
+                return localCerts;
+            }
+            
             String key = getKeyForIssuerSerial(cryptoType.getIssuer(), cryptoType.getSerial());
-            // Try local cache first
+            // Try local cache next
             if (xkmsClientCache != null) {
                 XKMSCacheToken cachedToken = xkmsClientCache.get(key);
                 if (cachedToken != null && cachedToken.getX509Certificate() != null)
{



Mime
View raw message