Bugzilla Bug 240128 - p2 unable to launch after SVN check-out of ide
diff --git a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
index d874883..e84ef9c 100644
--- a/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.engine/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Export-Package: org.eclipse.equinox.internal.p2.engine;x-friends:="org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.equinox.p2.touchpoint.natives",
org.eclipse.equinox.internal.provisional.p2.engine;
x-friends:="org.eclipse.equinox.p2.director.app,
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
index eb67ee9..c4d016c 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java
@@ -333,10 +333,12 @@
File[] profileDirectories = store.listFiles();
for (int i = 0; i < profileDirectories.length; i++) {
File profileFile = findLatestProfileFile(profileDirectories[i]);
- try {
- parser.parse(profileFile);
- } catch (IOException e) {
- LogHelper.log(new Status(IStatus.ERROR, EngineActivator.ID, NLS.bind(Messages.error_parsing_profile, profileFile), e));
+ if (profileFile != null) {
+ try {
+ parser.parse(profileFile);
+ } catch (IOException e) {
+ LogHelper.log(new Status(IStatus.ERROR, EngineActivator.ID, NLS.bind(Messages.error_parsing_profile, profileFile), e));
+ }
}
}
return parser.getProfileMap();
@@ -346,7 +348,11 @@
File latest = null;
long latestTimestamp = 0;
- File[] profileFiles = profileDirectory.listFiles();
+ File[] profileFiles = profileDirectory.listFiles(new FileFilter() {
+ public boolean accept(File pathname) {
+ return pathname.getName().endsWith(PROFILE_EXT) && !pathname.isDirectory();
+ }
+ });
for (int i = 0; i < profileFiles.length; i++) {
File profileFile = profileFiles[i];
String fileName = profileFile.getName();
