From 1de09b3a95ecff883ebbd1d991f2ec96e1748848 Mon Sep 17 00:00:00 2001
From: Pascal Rapicault (Ericsson)
Date: Tue, 13 Nov 2012 20:06:31 -0500
Subject: Bug 389667 - Folder created in user.home should mention os/ws/arch

---
 .../src/org/eclipse/equinox/launcher/Main.java                       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
index 6a51e42bf..a63d6930e 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
@@ -1354,10 +1354,15 @@ public class Main {
 			// add the hash to help prevent collisions
 			appName += File.separator + installDirHash;
 		}
+		appName += '_' + OS_WS_ARCHToString();
 		String userHome = System.getProperty(PROP_USER_HOME);
 		return new File(userHome, appName + "/" + pathAppendage).getAbsolutePath(); //$NON-NLS-1$
 	}
 
+	private String OS_WS_ARCHToString() {
+		return getOS() + '_' + getWS() + '_' + getArch();
+	}
+
 	/**
 	 * Return hash code identifying an absolute installation path
 	 * @return hash code as String
-- 
cgit v1.2.3