[300870] ComponentResolver performance improvement
diff --git a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
index b151641..0719cc4 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
+++ b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
@@ -25,5 +25,6 @@
<p>Bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=237092">237092</a>. ModuleCoreValidator deadlock</p>
<p>Bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=246776">246776</a>. WebLibs with spaces fail</p>
<p>Bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=266543">266543</a>. o.e.c.i.r.ResourceException: Resource /testValue does not exist.</p>
+<p>Bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=300870">300870</a>. ComponentResolver performance improvement</p>
</body></html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.properties b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
index bc777ff..2252601 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
@@ -42,6 +42,7 @@
Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=237092 ModuleCoreValidator deadlock\n\
Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=246776 WebLibs with spaces fail\n\
Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=266543 o.e.c.i.r.ResourceException: Resource /testValue does not exist.\n\
+Bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=300870 ComponentResolver performance improvement\n\
\n\
# "copyright" property - text of the "Feature Update Copyright"
diff --git a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
index 66102b8..8e67a4a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: Modulecore Plug-in
Bundle-Vendor: %provider
Bundle-SymbolicName: org.eclipse.wst.common.modulecore; singleton:=true
-Bundle-Version: 1.1.61.qualifier
+Bundle-Version: 1.1.62.qualifier
Bundle-Activator: org.eclipse.wst.common.componentcore.internal.ModulecorePlugin
Bundle-Localization: plugin
Export-Package: org.eclipse.wst.common.componentcore,
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java
index f480993..aaf0ea9 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentResolver.java
@@ -107,7 +107,7 @@
/* Recompute the IFile, if needed, from the base location. */
if (file == null) {
- if (baseLocation == null || baseLocation.length() == 0) {
+ if (baseLocation == null || baseLocation.length() == 0 || baseLocation.startsWith("wbit:")) { //$NON-NLS-1$
/*
* We can't proceed if we lack both an IFile and a system
* reference
