summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (Ericsson)2013-01-29 16:28:21 (EST)
committerPascal Rapicault2013-01-29 16:29:27 (EST)
commite8ff57bd347d06b28f155a7adcac357fb6167f24 (patch)
tree8813980077129dc884279c8cf6bc510064f8df6c
parent046ddafba42b935dcdec447fdc8d90e1549f68fa (diff)
downloadrt.equinox.p2-e8ff57bd347d06b28f155a7adcac357fb6167f24.zip
rt.equinox.p2-e8ff57bd347d06b28f155a7adcac357fb6167f24.tar.gz
rt.equinox.p2-e8ff57bd347d06b28f155a7adcac357fb6167f24.tar.bz2
Handle null when surrogate profile returns nullv20130129-212927I20130130-0800I20130129-2000
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java3
1 files changed, 3 insertions, 0 deletions
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 ca6b9ae..f5ceb6d 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
@@ -254,6 +254,9 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
}
if (profile == null) {
profile = createSurrogateProfile(id);
+ if (profile == null)
+ return null;
+
if (resetProfile) {
//Now that we created a new profile. Tag it, override the property and register the timestamp in the agent registry for pickup by other
internalSetProfileStateProperty(profile, profile.getTimestamp(), IProfile.STATE_PROP_SHARED_INSTALL, IProfile.STATE_SHARED_INSTALL_VALUE_NEW);