Author: stillalex
Date: Fri Oct 6 07:26:07 2017
New Revision: 1811297
URL: http://svn.apache.org/viewvc?rev=1811297&view=rev
Log:
OAK-6753 Wrong binding in TokenConfigurationImpl
- optimized case where there's a single entry (default)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java?rev=1811297&r1=1811296&r2=1811297&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
Fri Oct 6 07:26:07 2017
@@ -158,10 +158,13 @@ public class TokenConfigurationImpl exte
}
private CredentialsSupport newCredentialsSupport() {
- if (!credentialsSupport.isEmpty()) {
- return CompositeCredentialsSupport.newInstance(() ->
ImmutableSet.copyOf(credentialsSupport.values()));
- } else {
+ int size = credentialsSupport.size();
+ if (size == 0) {
return SimpleCredentialsSupport.getInstance();
+ } else if (size == 1) {
+ return credentialsSupport.values().iterator().next();
+ } else {
+ return CompositeCredentialsSupport.newInstance(() ->
ImmutableSet.copyOf(credentialsSupport.values()));
}
}
}
\ No newline at end of file
