--- old/src/java.base/share/classes/java/security/cert/X509CRLSelector.java 2015-04-23 15:28:18.428132685 -0700 +++ new/src/java.base/share/classes/java/security/cert/X509CRLSelector.java 2015-04-23 15:28:18.076132677 -0700 @@ -124,8 +124,8 @@ issuerX500Principals = null; } else { // clone - issuerX500Principals = new HashSet(issuers); - issuerNames = new HashSet(); + issuerX500Principals = new HashSet<>(issuers); + issuerNames = new HashSet<>(); for (X500Principal p : issuerX500Principals) { issuerNames.add(p.getEncoded()); } @@ -288,10 +288,10 @@ */ private void addIssuerNameInternal(Object name, X500Principal principal) { if (issuerNames == null) { - issuerNames = new HashSet(); + issuerNames = new HashSet<>(); } if (issuerX500Principals == null) { - issuerX500Principals = new HashSet(); + issuerX500Principals = new HashSet<>(); } issuerNames.add(name); issuerX500Principals.add(principal); @@ -311,7 +311,7 @@ private static HashSet cloneAndCheckIssuerNames(Collection names) throws IOException { - HashSet namesCopy = new HashSet(); + HashSet namesCopy = new HashSet<>(); Iterator i = names.iterator(); while (i.hasNext()) { Object nameObject = i.next(); @@ -363,7 +363,7 @@ */ private static HashSet parseIssuerNames(Collection names) throws IOException { - HashSet x500Principals = new HashSet(); + HashSet x500Principals = new HashSet<>(); for (Iterator t = names.iterator(); t.hasNext(); ) { Object nameObject = t.next(); if (nameObject instanceof String) { @@ -701,9 +701,9 @@ X509CRLSelector copy = (X509CRLSelector)super.clone(); if (issuerNames != null) { copy.issuerNames = - new HashSet(issuerNames); + new HashSet<>(issuerNames); copy.issuerX500Principals = - new HashSet(issuerX500Principals); + new HashSet<>(issuerX500Principals); } return copy; } catch (CloneNotSupportedException e) {