summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (Ericsson)2013-01-29 16:27:43 (EST)
committerPascal Rapicault2013-01-29 16:29:18 (EST)
commit046ddafba42b935dcdec447fdc8d90e1549f68fa (patch)
tree945e4b25e7fd1935b7963162fc1ceb75545dcece
parenta092342e091d2dd97df3a531db8497f812a941e2 (diff)
downloadrt.equinox.p2-046ddafba42b935dcdec447fdc8d90e1549f68fa.zip
rt.equinox.p2-046ddafba42b935dcdec447fdc8d90e1549f68fa.tar.gz
rt.equinox.p2-046ddafba42b935dcdec447fdc8d90e1549f68fa.tar.bz2
Bug 399406 -[engine] NPE in SimpleProfileRegistry.internalSetProfileStateProperty while selfthosing
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java4
1 files changed, 3 insertions, 1 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 c8309f2..ca6b9ae 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
@@ -263,7 +263,9 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
} else {
//This is the first time we create the shared profile. Tag it as such and also remember the timestamp of the base
internalSetProfileStateProperty(profile, profile.getTimestamp(), IProfile.STATE_PROP_SHARED_INSTALL, IProfile.STATE_SHARED_INSTALL_VALUE_INITIAL);
- internalSetProfileStateProperty(profile, profile.getTimestamp(), SIMPLE_PROFILE_REGISTRY_INTERNAL + getBaseTimestamp(profile.getProfileId()), getBaseTimestamp(id));
+ String baseTimestamp = getBaseTimestamp(id);
+ if (baseTimestamp != null)
+ internalSetProfileStateProperty(profile, profile.getTimestamp(), SIMPLE_PROFILE_REGISTRY_INTERNAL + baseTimestamp, baseTimestamp);
}
}
}