1 files changed, 6 insertions, 10 deletions

diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java
index d432a4e6d..6869eb284 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java
@@ -11,11 +11,10 @@
 package org.eclipse.equinox.internal.p2.touchpoint.eclipse;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
-import org.eclipse.core.runtime.URIUtil;
 import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
 import org.eclipse.equinox.internal.provisional.frameworkadmin.*;
-import org.eclipse.equinox.internal.provisional.p2.engine.IProfile;
+import org.eclipse.equinox.p2.core.IProvisioningAgent;
+import org.eclipse.equinox.p2.engine.IProfile;
 import org.osgi.framework.*;
 import org.osgi.util.tracker.ServiceTracker;
 
@@ -28,9 +27,11 @@ public class LazyManipulator implements Manipulator {
 
 	private Manipulator manipulator;
 	private final IProfile profile;
+	private final IProvisioningAgent agent;
 
-	public LazyManipulator(IProfile profile) {
+	public LazyManipulator(IProvisioningAgent agent, IProfile profile) {
 		this.profile = profile;
+		this.agent = agent;
 	}
 
 	private void loadDelegate() {
@@ -61,12 +62,7 @@ public class LazyManipulator implements Manipulator {
 		}
 		//TODO These values should be inserted by a configuration unit (bug 204124)
 		manipulator.getConfigData().setProperty("eclipse.p2.profile", profile.getProfileId()); //$NON-NLS-1$
-		try {
-			manipulator.getConfigData().setProperty("eclipse.p2.data.area", URIUtil.toURI(Util.getAgentLocation().getURL()).toString()); //$NON-NLS-1$
-		} catch (URISyntaxException e) {
-			LogHelper.log(Util.createError(Messages.error_loading_manipulator, e));
-			throw new IllegalStateException(Messages.error_loading_manipulator);
-		}
+		manipulator.getConfigData().setProperty("eclipse.p2.data.area", Util.getAgentLocation(agent).getRootLocation().toString()); //$NON-NLS-1$
 	}
 
 	public static FrameworkAdmin getFrameworkAdmin() {