Attachment 167222 Details for Bug 311789 – Fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix

patch.txt (text/plain), 2.26 KB, created by John Arthorne

on 2010-05-05 16:14:18 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2010-05-05 16:14:18 EDT

Size: 2.26 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.engine
>Index: src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java,v
>retrieving revision 1.22
>diff -u -r1.22 SurrogateProfileHandler.java
>--- src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java	3 May 2010 12:16:33 -0000	1.22
>+++ src/org/eclipse/equinox/internal/p2/engine/SurrogateProfileHandler.java	5 May 2010 20:14:03 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- *  Copyright (c) 2007, 2009 IBM Corporation and others.
>+ *  Copyright (c) 2007, 2010 IBM Corporation and others.
>  *  All rights reserved. This program and the accompanying materials
>  *  are made available under the terms of the Eclipse Public License v1.0
>  *  which accompanies this distribution, and is available at
>@@ -12,11 +12,11 @@
> 
> import java.io.File;
> import java.lang.ref.SoftReference;
>-import java.net.MalformedURLException;
>-import java.net.URL;
>+import java.net.*;
> import java.util.ArrayList;
> import java.util.Iterator;
> import org.eclipse.core.runtime.IProgressMonitor;
>+import org.eclipse.core.runtime.URIUtil;
> import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
> import org.eclipse.equinox.p2.core.IProvisioningAgent;
> import org.eclipse.equinox.p2.engine.IProfile;
>@@ -149,10 +149,12 @@
> 			String installArea = EngineActivator.getContext().getProperty(OSGI_INSTALL_AREA);
> 			try {
> 				URL registryURL = new URL(installArea + P2_ENGINE_DIR + SimpleProfileRegistry.DEFAULT_STORAGE_DIR);
>-				File sharedRegistryDirectory = new File(registryURL.getPath());
>+				File sharedRegistryDirectory = URIUtil.toFile(URIUtil.toURI(registryURL));
> 				profileRegistry = new SimpleProfileRegistry(agent, sharedRegistryDirectory, null, false);
> 			} catch (MalformedURLException e) {
> 				//this is not possible because we know the above URL is valid
>+			} catch (URISyntaxException e) {
>+				//this is not possible because we know the above URL is valid
> 			}
> 		}
> 		return profileRegistry;

Actions: View | Diff

Attachments on bug 311789: 167222