blob: f7089f99bbcfc6a2ee857aecfd78097f3ac8812a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
diff --git a/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java b/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java
index 5f922f12..217516cf 100644
--- a/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java
+++ b/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java
@@ -107,9 +107,29 @@ class FileSystemPreferences extends AbstractPreferences {
private static void setupUserRoot() {
AccessController.doPrivileged(new PrivilegedAction<Void>() {
public Void run() {
- userRootDir =
- new File(System.getProperty("java.util.prefs.userRoot",
- System.getProperty("user.home")), ".java/.userPrefs");
+ /* On Linux systems, put the userPrefs dir into
+ * ${XDG_CONFIG_HOME:-$HOME/.config}/java/userPrefs in order to
+ * follow the XDG Base Directory Specification.
+ */
+ if (System.getProperty("os.name").equals("Linux")) {
+ /* assume findable homedir, which the jvm already does */
+ String xdgDefaultConfigHome = System.getenv("HOME") + "/.config";
+ String xdgConfigHomeEnvVar = "XDG_CONFIG_HOME";
+ String xdgConfigDir;
+
+ String xdgSetConfigDir = System.getenv(xdgConfigHomeEnvVar);
+
+ if (xdgSetConfigDir == null) {
+ xdgConfigDir = xdgDefaultConfigHome;
+ } else {
+ xdgConfigDir = xdgSetConfigDir;
+ }
+ userRootDir = new File(xdgConfigDir, "java/userPrefs");
+ } else {
+ userRootDir =
+ new File(System.getProperty("java.util.prefs.userRoot",
+ System.getProperty("user.home")), ".java/.userPrefs");
+ }
// Attempt to create root dir if it does not yet exist.
if (!userRootDir.exists()) {
if (userRootDir.mkdirs()) {
|