Changed getClientIdentities and getServerIdentities to use the first non-empty mapping results

3bc97e95 · Victor Hong · b90fd62c · 3bc97e95
Commit 3bc97e95 authored Jul 28, 2015 by Victor Hong
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

CertificateManager.java src/java/org/jivesoftware/util/CertificateManager.java +8 -2

No files found.
--- a/src/java/org/jivesoftware/util/CertificateManager.java
+++ b/src/java/org/jivesoftware/util/CertificateManager.java
@@ -397,7 +397,10 @@ public class CertificateManager {
    	for (CertificateIdentityMapping mapping : clientCertMapping) {
    		List<String> identities = mapping.mapIdentity(x509Certificate);
    		Log.debug("CertificateManager: " + mapping.name() + " returned " + identities.toString());
-    		names.addAll(identities);
+    		if (!identities.isEmpty()) {
+    			names.addAll(identities);
+    			break;
+    		}
    	}

        return names;
@@ -420,7 +423,10 @@ public class CertificateManager {
    	for (CertificateIdentityMapping mapping : serverCertMapping) {
    		List<String> identities = mapping.mapIdentity(x509Certificate);
    		Log.debug("CertificateManager: " + mapping.name() + " returned " + identities.toString());
-    		names.addAll(identities);
+    		if (!identities.isEmpty()) {
+    			names.addAll(identities);
+    			break;
+    		}
    	}

        return names;