1 files changed, 3 insertions, 4 deletions
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
index 3b3d8c529..2593e0c0b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
@@ -202,9 +202,8 @@ public class ACLPanel extends CMSBaseUGTab {
         int i=0;
         String[] vals = new String[response.size()];
 
-        for (Enumeration e = response.getNames(); e.hasMoreElements() ;) {
-            String entry = ((String)e.nextElement()).trim();
-            vals[i++] = entry;
+        for (String entry : response.keySet()) {
+            vals[i++] = entry.trim();
         }
 
         CMSAdminUtil.bubbleSort(vals);
@@ -215,7 +214,7 @@ public class ACLPanel extends CMSBaseUGTab {
             v.addElement(new JLabel(name,
                     CMSAdminUtil.getImage(CMSAdminResources.IMAGE_ACL),
                     JLabel.LEFT));
-            v.addElement(response.getValue(name));
+            v.addElement(response.get(name));
             mDataModel.addRow(v);
         }