Skip to content

Commit 28b39c7

Browse files
author
Rishabh Kumar
committed
OAK-11640 : incorporated review comments)
1 parent db933cf commit 28b39c7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import java.util.LinkedHashSet;
2626
import java.util.Map;
2727
import java.util.Set;
28-
import java.util.stream.Collectors;
29-
import java.util.stream.Stream;
3028
import javax.jcr.Credentials;
3129
import javax.jcr.NoSuchWorkspaceException;
3230
import javax.security.auth.DestroyFailedException;
@@ -215,8 +213,10 @@ public void initialize(Subject subject, CallbackHandler callbackHandler, Map<Str
215213
@Override
216214
public boolean logout() throws LoginException {
217215
boolean success = false;
218-
Set<Object> creds = Stream.concat(subject.getPublicCredentials(Credentials.class).stream(), subject.getPublicCredentials(AuthInfo.class).stream())
219-
.collect(Collectors.toCollection(LinkedHashSet::new));
216+
Set<Object> builder = new LinkedHashSet<>(subject.getPublicCredentials(Credentials.class));
217+
builder.addAll(subject.getPublicCredentials(AuthInfo.class));
218+
Set<Object> creds = Collections.unmodifiableSet(builder);
219+
220220
if (!subject.getPrincipals().isEmpty() && !creds.isEmpty()) {
221221
// clear subject if not readonly
222222
if (!subject.isReadOnly()) {

0 commit comments

Comments
 (0)