FELIX-1788: Set felix.fileinstall.tmpdir to ${java.io.tmpdir} by default
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@828016 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
index e670363..6e0f27c 100644
--- a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
+++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/DirectoryWatcher.java
@@ -120,7 +120,7 @@
originatingFileName = (String) properties.get(FILENAME);
watchedDirectory = getFile(properties, DIR, new File("./load"));
prepareDir(watchedDirectory);
- tmpDir = getFile(properties, TMPDIR, new File("./tmp"));
+ tmpDir = getFile(properties, TMPDIR, new File(System.getProperty("java.io.tmpdir"), "fileinstall"));
startBundles = getBoolean(properties, START_NEW_BUNDLES, true); // by default, we start bundles.
filter = (String) properties.get(FILTER);
noInitialDelay = getBoolean(properties, NO_INITIAL_DELAY, false);
diff --git a/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java b/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java
index a17fcae..68c4953 100644
--- a/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java
+++ b/fileinstall/src/test/java/org/apache/felix/fileinstall/internal/DirectoryWatcherTest.java
@@ -183,8 +183,8 @@
"src" + File.separatorChar + "test" + File.separatorChar + "resources" ) );
assertEquals( "Default POLL parameter correctly read", 2000l, dw.poll );
assertEquals( "Default DEBUG parameter correctly read", -1l, dw.debug );
- assertTrue( "Default TMPDIR parameter correctly read", dw.tmpDir.getAbsolutePath().endsWith(
- File.separatorChar + "tmp" ) );
+ assertTrue( "Default TMPDIR parameter correctly read", dw.tmpDir.getAbsolutePath().equals(
+ new File(System.getProperty("java.io.tmpdir"), "fileinstall").getAbsolutePath()) );
assertEquals( "Default START_NEW_BUNDLES parameter correctly read", true, dw.startBundles );
assertEquals( "Default FILTER parameter correctly read", null, dw.filter );
}