peterreilly 2004/10/28 01:48:48
Modified: . Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
Project.java Diagnostics.java
src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
CommandlineJava.java
Log:
sync
Revision Changes Path
No revision
No revision
1.503.2.143 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.142
retrieving revision 1.503.2.143
diff -u -r1.503.2.142 -r1.503.2.143
--- WHATSNEW 27 Oct 2004 12:50:19 -0000 1.503.2.142
+++ WHATSNEW 28 Oct 2004 08:48:48 -0000 1.503.2.143
@@ -63,6 +63,9 @@
* 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
===================================
No revision
No revision
1.154.2.12 +2 -2 ant/src/main/org/apache/tools/ant/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.154.2.11
retrieving revision 1.154.2.12
diff -u -r1.154.2.11 -r1.154.2.12
--- Project.java 17 Jul 2004 16:34:40 -0000 1.154.2.11
+++ Project.java 28 Oct 2004 08:48:48 -0000 1.154.2.12
@@ -824,7 +824,7 @@
*/
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();
1.10.2.5 +1 -1 ant/src/main/org/apache/tools/ant/Diagnostics.java
Index: Diagnostics.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Diagnostics.java,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -r1.10.2.4 -r1.10.2.5
--- Diagnostics.java 9 Mar 2004 17:01:29 -0000 1.10.2.4
+++ Diagnostics.java 28 Oct 2004 08:48:48 -0000 1.10.2.5
@@ -266,7 +266,7 @@
* @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));
No revision
No revision
1.47.2.7 +1 -1
ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
Index: CommandlineJava.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
retrieving revision 1.47.2.6
retrieving revision 1.47.2.7
diff -u -r1.47.2.6 -r1.47.2.7
--- CommandlineJava.java 20 Apr 2004 06:53:29 -0000 1.47.2.6
+++ CommandlineJava.java 28 Oct 2004 08:48:48 -0000 1.47.2.7
@@ -127,7 +127,7 @@
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));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
