From eb521232f2f2cd922c15fce69cd537145bc82c7d Mon Sep 17 00:00:00 2001 From: Jamil Nimeh Date: Tue, 10 Jun 2014 14:17:32 -0700 Subject: [PATCH] 8046368: Code cleanup in SeedGenerator.java Reviewed-by: mullan --- .../classes/sun/security/provider/SeedGenerator.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/jdk/src/share/classes/sun/security/provider/SeedGenerator.java b/jdk/src/share/classes/sun/security/provider/SeedGenerator.java index c4438da2a90..b4c2e77c2e0 100644 --- a/jdk/src/share/classes/sun/security/provider/SeedGenerator.java +++ b/jdk/src/share/classes/sun/security/provider/SeedGenerator.java @@ -150,14 +150,13 @@ abstract class SeedGenerator { * Retrieve some system information, hashed. */ static byte[] getSystemEntropy() { - byte[] ba; final MessageDigest md; try { md = MessageDigest.getInstance("SHA"); } catch (NoSuchAlgorithmException nsae) { - throw new InternalError("internal error: SHA-1 not available." - , nsae); + throw new InternalError("internal error: SHA-1 not available.", + nsae); } // The current time in millis @@ -170,11 +169,8 @@ abstract class SeedGenerator { public Void run() { try { // System properties can change from machine to machine - String s; Properties p = System.getProperties(); - Enumeration e = p.propertyNames(); - while (e.hasMoreElements()) { - s =(String)e.nextElement(); + for (String s: p.stringPropertyNames()) { md.update(s.getBytes()); md.update(p.getProperty(s).getBytes()); }