Merge branch 'vd/jinterface_windows_cookie/OTP-10821'

* vd/jinterface_windows_cookie/OTP-10821:
  jinterface: fix finding cookie file on windows

1 files changed, 14 insertions, 2 deletions

diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java
index cea5080607..968f284bff 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java
@@ -118,8 +118,9 @@ public class AbstractNode {
 	    localHost = "localhost";
 	}
 
-	final String dotCookieFilename = System.getProperty("user.home")
-		+ File.separator + ".erlang.cookie";
+	final String homeDir = getHomeDir();
+	final String dotCookieFilename = homeDir + File.separator
+                + ".erlang.cookie";
 	BufferedReader br = null;
 
 	try {
@@ -251,4 +252,15 @@ public class AbstractNode {
     public String toString() {
 	return node();
     }
+
+    private static String getHomeDir() {
+	final String home = System.getProperty("user.home");
+	if (System.getProperty("os.name").toLowerCase().contains("windows")) {
+	    final String drive = System.getenv("HOMEDRIVE");
+	    final String path = System.getenv("HOMEPATH");
+	    return (drive != null && path != null) ? drive + path : home;
+	} else {
+	    return home;
+	}
+    }
 }