bodewig 2003/01/17 06:46:51
Modified: . Tag: ANT_15_BRANCH WHATSNEW
src/main/org/apache/tools/ant/util Tag: ANT_15_BRANCH
FileUtils.java
Log:
Merge fix for bug 15399 from HEAD
Revision Changes Path
No revision
No revision
1.263.2.112 +2 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.263.2.111
retrieving revision 1.263.2.112
diff -u -r1.263.2.111 -r1.263.2.112
--- WHATSNEW 17 Jan 2003 12:50:27 -0000 1.263.2.111
+++ WHATSNEW 17 Jan 2003 14:46:50 -0000 1.263.2.112
@@ -45,6 +45,8 @@
* Ant didn't find the runtime libraries on IBM's JDK 1.4 for Linux.
+* random component of temporary files is now always a positive integer.
+
* Ant could incorrectly try to use the 1.4 regexp implementation even
if it isn't available if you run the JVM with -Xverify:none.
No revision
No revision
1.25.2.6 +3 -3
jakarta-ant/src/main/org/apache/tools/ant/util/FileUtils.java
Index: FileUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
retrieving revision 1.25.2.5
retrieving revision 1.25.2.6
diff -u -r1.25.2.5 -r1.25.2.6
--- FileUtils.java 4 Dec 2002 17:02:37 -0000 1.25.2.5
+++ FileUtils.java 17 Jan 2003 14:46:51 -0000 1.25.2.6
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -682,7 +682,7 @@
synchronized (rand) {
do {
result = new File(parent,
- prefix + fmt.format(rand.nextInt())
+ prefix +
fmt.format(Math.abs(rand.nextInt()))
+ suffix);
} while (result.exists());
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
