summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (Ericsson)2013-02-11 11:47:11 (EST)
committerPascal Rapicault2013-02-11 11:47:11 (EST)
commit73c99f4c4246af7389fc140fc243ccf531acad68 (patch)
tree6a65751f67bbbc255460cf81616c46bec292df98
parent825a4fd5a6bb07a479018dd4e082b87dabbe7257 (diff)
downloadrt.equinox.p2-73c99f4c4246af7389fc140fc243ccf531acad68.zip
rt.equinox.p2-73c99f4c4246af7389fc140fc243ccf531acad68.tar.gz
rt.equinox.p2-73c99f4c4246af7389fc140fc243ccf531acad68.tar.bz2
Check for agent first since it can be nullv20130211-164711
-rw-r--r--bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/Activator.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/Activator.java b/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/Activator.java
index daa18e9..5cf7bbb 100644
--- a/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.extensionlocation/src/org/eclipse/equinox/internal/p2/extensionlocation/Activator.java
@@ -76,9 +76,12 @@ public class Activator implements BundleActivator {
}
public static IFileArtifactRepository getBundlePoolRepository() {
- IProfile profile = getCurrentProfile();
IProvisioningAgent agent = getCurrentAgent();
- if (profile == null || agent == null)
+ if (agent == null)
+ return null;
+
+ IProfile profile = getCurrentProfile();
+ if (profile == null)
return null;
return Util.getAggregatedBundleRepository(agent, profile, Util.AGGREGATE_CACHE | Util.AGGREGATE_SHARED_CACHE);