Fix NPE on the mac and make the base always match install location

1 files changed, 11 insertions, 8 deletions

diff --git a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java
index eef9d1393..6cbea46f7 100644
--- a/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java
+++ b/bundles/org.eclipse.equinox.p2.installer/src/org/eclipse/equinox/internal/p2/installer/InstallDescriptionParser.java
@@ -48,14 +48,17 @@ public class InstallDescriptionParser {
 		URI propsURI = URIUtil.fromString(site);
 		InputStream in = null;
 		if (!propsURI.isAbsolute()) {
-			File file = new File(site).getAbsoluteFile();
-			if (file.exists()) {
-				propsURI = file.toURI();
-				in = new FileInputStream(file);
-			} else
-				propsURI = null;
-		} else
-			in = propsURI.toURL().openStream();
+			String installerInstallArea = System.getProperty("osgi.install.area");
+			if (installerInstallArea == null)
+				throw new IllegalStateException("Install area is not specified.");
+
+			propsURI = URIUtil.append(URIUtil.fromString(installerInstallArea), site);
+			File installerDescription = URIUtil.toFile(propsURI);
+			if (!installerDescription.exists()) {
+				throw new IllegalStateException("Can't find install description file: " + installerDescription);
+			}
+		}
+		in = propsURI.toURL().openStream();
 
 		Properties properties = new Properties();
 		try {