From 7e145de4f1d0b125c3b9c9b3ce11f29609f5e55d Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Thu, 28 Oct 2004 08:47:26 +0000
Subject: [PATCH] Properties.propertyNames() should be used instead of .keys().
 PR: 27261 Obtained from: Mike Murray

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276969 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                                 | 3 +++
 src/main/org/apache/tools/ant/Diagnostics.java           | 2 +-
 src/main/org/apache/tools/ant/Project.java               | 2 +-
 src/main/org/apache/tools/ant/types/CommandlineJava.java | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index cda6efca1..c0c5de6b2 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -135,6 +135,9 @@ Fixed bugs:
 * NPE using XmlLogger and antlib.
   Bugzilla report 31840.
 
+* Properties.propertyNames() should be used instead of .keys().
+  Bugzilla report 27261.
+
 Changes from Ant 1.6.1 to Ant 1.6.2
 ===================================
 
diff --git a/src/main/org/apache/tools/ant/Diagnostics.java b/src/main/org/apache/tools/ant/Diagnostics.java
index 7e3e3cc6b..93a4a5360 100644
--- a/src/main/org/apache/tools/ant/Diagnostics.java
+++ b/src/main/org/apache/tools/ant/Diagnostics.java
@@ -266,7 +266,7 @@ public final class Diagnostics {
      * @param out the stream to print the properties to.
      */
     private static void doReportSystemProperties(PrintStream out) {
-        for (Enumeration keys = System.getProperties().keys();
+        for (Enumeration keys = System.getProperties().propertyNames();
             keys.hasMoreElements();) {
             String key = (String) keys.nextElement();
             out.println(key + " : " + System.getProperty(key));
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index 03f72b4f2..f310f1cc5 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -828,7 +828,7 @@ public class Project {
      */
     public void setSystemProperties() {
         Properties systemP = System.getProperties();
-        Enumeration e = systemP.keys();
+        Enumeration e = systemP.propertyNames();
         while (e.hasMoreElements()) {
             Object name = e.nextElement();
             String value = systemP.get(name).toString();
diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java
index 939926644..882f09025 100644
--- a/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -133,7 +133,7 @@ public class CommandlineJava implements Cloneable {
             try {
                 sys = System.getProperties();
                 Properties p = new Properties();
-                for (Enumeration e = sys.keys(); e.hasMoreElements();) {
+                for (Enumeration e = sys.propertyNames(); e.hasMoreElements();) {
                     Object o = e.nextElement();
                     p.put(o, sys.get(o));
                 }