archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8265765: DomainKeyStore may stop enumerating aliases if a constituting KeyStore is empty

Browse source 
Reviewed-by: weijun
This commit is contained in:
Hai-May Chao 2022-02-09 16:53:48 +00:00
parent c5c8c0644d
commit 178b962e01
2 changed files with 134 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/java.base/share/classes/sun/security/provider/DomainKeyStore.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -419,20 +419,22 @@ abstract class DomainKeyStore extends KeyStoreSpi {
if (aliases.hasMoreElements()) {
return true;
} else {
if (iterator.hasNext()) {
while (iterator.hasNext()) {
keystoresEntry = iterator.next();
prefix = keystoresEntry.getKey() +
entryNameSeparator;
entryNameSeparator;
aliases = keystoresEntry.getValue().aliases();
} else {
return false;
if (aliases.hasMoreElements()) {
return true;
} else {
continue;
}
}
return false;
}
} catch (KeyStoreException e) {
return false;
}
return aliases.hasMoreElements();
}
public String nextElement() {