Merge pull request #550 from vishnusarathashling/master

[#549] Fix NPE in XpackUtils::getSysRepoBasePaths

Author: ilg-ul

plugins/org.eclipse.embedcdt.core/src/org/eclipse/embedcdt/core/XpackUtils.java

@@ -96,16 +96,14 @@ public static IPath[] getRepoBasePaths() {
 	// DEPRECATED
 	public static IPath getSysRepoBasePath() {
 
-		Map<String, String> env = System.getenv();
-
 		if (EclipseUtils.isMacOSX()) {
 			IPath path = new Path("/opt");
 			return path;
 		} else if (EclipseUtils.isLinux()) {
 			IPath path = new Path("/opt");
 			return path;
 		} else if (EclipseUtils.isWindows()) {
-			String progFolder = env.get("ProgramFiles");
+			String progFolder = System.getenv("ProgramFiles");
 			IPath path = new Path(progFolder);
 			return path;
 		}
@@ -114,8 +112,6 @@ public static IPath getSysRepoBasePath() {
 
 	public static IPath[] getSysRepoBasePaths() {
 
-		Map<String, String> env = System.getenv();
-
 		if (EclipseUtils.isMacOSX()) {
 			IPath[] paths = new IPath[1];
 			paths[0] = new Path("/opt");
@@ -126,7 +122,7 @@ public static IPath[] getSysRepoBasePaths() {
 			return paths;
 		} else if (EclipseUtils.isWindows()) {
 			IPath[] paths = new IPath[1];
-			String progFolder = env.get("ProgramFiles");
+			String progFolder = System.getenv("ProgramFiles");
 			paths[0] = new Path(progFolder);
 			return paths;
 		}