Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 231178
Collapse All | Expand All

(-)src/org/eclipse/equinox/internal/p2/extensionlocation/SiteListener.java (-3 / +2 lines)
Lines 14-20 Link Here
14
import java.net.MalformedURLException;
14
import java.net.MalformedURLException;
15
import java.net.URL;
15
import java.net.URL;
16
import java.util.*;
16
import java.util.*;
17
import org.eclipse.core.runtime.*;
17
import org.eclipse.core.runtime.IStatus;
18
import org.eclipse.core.runtime.Status;
18
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
19
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;
19
import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;
20
import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;
20
import org.eclipse.equinox.internal.p2.metadata.generator.features.FeatureParser;
21
import org.eclipse.equinox.internal.p2.metadata.generator.features.FeatureParser;
Lines 179-186 Link Here
179
			String line = (String) e.nextElement();
180
			String line = (String) e.nextElement();
180
			StringTokenizer tokenizer = new StringTokenizer(line, ";"); //$NON-NLS-1$
181
			StringTokenizer tokenizer = new StringTokenizer(line, ";"); //$NON-NLS-1$
181
			String targetSite = tokenizer.nextToken();
182
			String targetSite = tokenizer.nextToken();
182
			if (targetSite.startsWith("file:") && new Path(targetSite).lastSegment().equals("eclipse")) //$NON-NLS-1$//$NON-NLS-2$
183
				targetSite = targetSite.substring(0, targetSite.length() - 8);
184
			if (!url.equals(targetSite))
183
			if (!url.equals(targetSite))
185
				continue;
184
				continue;
186
			result.add(tokenizer.nextToken());
185
			result.add(tokenizer.nextToken());
(-)src/org/eclipse/equinox/internal/p2/reconciler/dropins/PlatformXmlListener.java (-2 lines)
Lines 155-162 Link Here
155
		for (Iterator iter = sites.iterator(); iter.hasNext();) {
155
		for (Iterator iter = sites.iterator(); iter.hasNext();) {
156
			Site site = (Site) iter.next();
156
			Site site = (Site) iter.next();
157
			String siteURL = site.getUrl();
157
			String siteURL = site.getUrl();
158
			if (siteURL.startsWith("file:") && new Path(siteURL).lastSegment().equals("eclipse")) //$NON-NLS-1$ //$NON-NLS-2$
159
				siteURL = siteURL.substring(0, siteURL.length() - 8);
160
			IMetadataRepository match = getMatchingRepo(configRepositories, siteURL);
158
			IMetadataRepository match = getMatchingRepo(configRepositories, siteURL);
161
			if (match == null) {
159
			if (match == null) {
162
				try {
160
				try {

Return to bug 231178