You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/06/08 15:04:58 UTC
svn commit: r1133384 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/
lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java solr/
Author: rmuir
Date: Wed Jun 8 13:04:58 2011
New Revision: 1133384
URL: http://svn.apache.org/viewvc?rev=1133384&view=rev
Log:
LUCENE-3176: fix getTempDir to actually return a unique new temp directory (not something based on LTC's seed)
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java?rev=1133384&r1=1133383&r2=1133384&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java Wed Jun 8 13:04:58 2011
@@ -46,12 +46,17 @@ import org.apache.lucene.store.Directory
public class _TestUtil {
- /** Returns temp dir, containing String arg in its name;
+ /** Returns temp dir, based on String arg in its name;
* does not create the directory. */
public static File getTempDir(String desc) {
- File f = new File(LuceneTestCase.TEMP_DIR, desc + "." + LuceneTestCase.random.nextLong());
- LuceneTestCase.registerTempFile(f);
- return f;
+ try {
+ File f = createTempFile(desc, "tmp", LuceneTestCase.TEMP_DIR);
+ f.delete();
+ LuceneTestCase.registerTempFile(f);
+ return f;
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
/**