diff options
author | Thomas Watson | 2011-11-04 18:45:53 +0000 |
---|---|---|
committer | Thomas Watson | 2011-11-04 18:45:53 +0000 |
commit | 87d904bb25c232845160fa7fac98be5ad82eebef (patch) | |
tree | 0c8a645e29f3df5a8b28e3abacc39a17252b920e | |
parent | 609c7b5ae81f664920ccfe09d0b8d59cab098791 (diff) | |
download | rt.equinox.framework-20111104-1845.tar.gz rt.equinox.framework-20111104-1845.tar.xz rt.equinox.framework-20111104-1845.zip |
Bug 362648 - Error "The configuration area ... not writable" at startv20111104-1845
Eclipse 3.6.0
2 files changed, 5 insertions, 1 deletions
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 ac439f09e..0545349ca 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 @@ -1165,6 +1165,8 @@ public class Main { private static URL buildURL(String spec, boolean trailingSlash) { if (spec == null) return null; + if (File.separatorChar == '\\') + spec = spec.trim(); boolean isFile = spec.startsWith(FILE_SCHEME); try { if (isFile) { diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/LocationHelper.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/LocationHelper.java index ed3e6c140..0180bf04c 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/LocationHelper.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/core/runtime/internal/adaptor/LocationHelper.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 IBM Corporation and others. + * Copyright (c) 2006, 2011 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 @@ -28,6 +28,8 @@ public class LocationHelper { public static URL buildURL(String spec, boolean trailingSlash) { if (spec == null) return null; + if (File.separatorChar == '\\') + spec = spec.trim(); boolean isFile = spec.startsWith("file:"); //$NON-NLS-1$ try { if (isFile) |