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

8273261: Replace 'while' cycles with iterator with enhanced-for in java.base

Browse source 
Reviewed-by: dfuchs, rriggs, iris, mullan
This commit is contained in:
Andrey Turbanov 2021-09-23 20:04:36 +00:00 • committed by Roger Riggs
parent 0aa63feca8
commit 56b8b35286
11 changed files with 43 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/share/classes/javax/security/auth/PrivateCredentialPermission.java
View file

@ -145,9 +145,7 @@ public final class PrivateCredentialPermission extends Permission {
} else {
this.credOwners = new CredOwner[principals.size()];
int index = 0;
Iterator<Principal> i = principals.iterator();
while (i.hasNext()) {
Principal p = i.next();
for (Principal p : principals) {
this.credOwners[index++] = new CredOwner
(p.getClass().getName(),
p.getName());

30
src/java.base/share/classes/javax/security/auth/Subject.java
View file

@ -886,18 +886,14 @@ public final class Subject implements java.io.Serializable {
String suffix = "";
synchronized(principals) {
Iterator<Principal> pI = principals.iterator();
while (pI.hasNext()) {
Principal p = pI.next();
for (Principal p : principals) {
suffix = suffix + ResourcesMgr.getString(".Principal.") +
p.toString() + ResourcesMgr.getString("NEWLINE");
}
}
synchronized(pubCredentials) {
Iterator<Object> pI = pubCredentials.iterator();
while (pI.hasNext()) {
Object o = pI.next();
for (Object o : pubCredentials) {
suffix = suffix +
ResourcesMgr.getString(".Public.Credential.") +
o.toString() + ResourcesMgr.getString("NEWLINE");
@ -951,17 +947,14 @@ public final class Subject implements java.io.Serializable {
int hashCode = 0;
synchronized(principals) {
Iterator<Principal> pIterator = principals.iterator();
while (pIterator.hasNext()) {
Principal p = pIterator.next();
for (Principal p : principals) {
hashCode ^= p.hashCode();
}
}
synchronized(pubCredentials) {
Iterator<Object> pubCIterator = pubCredentials.iterator();
while (pubCIterator.hasNext()) {
hashCode ^= getCredHashCode(pubCIterator.next());
for (Object pubCredential : pubCredentials) {
hashCode ^= getCredHashCode(pubCredential);
}
}
return hashCode;
@ -1308,13 +1301,12 @@ public final class Subject implements java.io.Serializable {
});
}
Iterator<?> ce = c.iterator();
while (ce.hasNext()) {
if (next.equals(ce.next())) {
e.remove();
modified = true;
break;
}
for (Object o : c) {
if (next.equals(o)) {
e.remove();
modified = true;
break;
}
}
}
return modified;