summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (Ericsson)2013-02-05 20:50:41 (EST)
committerPascal Rapicault2013-02-05 20:50:41 (EST)
commit0f4ebc4340094e08d3fb89818d0ce472bc5b16a3 (patch)
tree018beaf6866e8659a222c70da35ce055632cd163
parent725d65da2ca10bacb503ca3a689f1582dece86c7 (diff)
downloadrt.equinox.p2-0f4ebc4340094e08d3fb89818d0ce472bc5b16a3.zip
rt.equinox.p2-0f4ebc4340094e08d3fb89818d0ce472bc5b16a3.tar.gz
rt.equinox.p2-0f4ebc4340094e08d3fb89818d0ce472bc5b16a3.tar.bz2
Check for the presence of the agent registered property
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/SimpleProfileRegistry.java7
1 files changed, 3 insertions, 4 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 f5ceb6d..503f297 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
@@ -142,9 +142,6 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
if (Boolean.valueOf(selfProfile.getProperty(IProfile.PROP_ROAMING)).booleanValue())
changed = updateRoamingProfile(selfProfile);
- if (surrogateProfileHandler != null && surrogateProfileHandler.isSurrogate(selfProfile))
- changed = changed || surrogateProfileHandler.updateProfile(selfProfile);
-
if (changed)
saveProfile(selfProfile);
}
@@ -276,7 +273,7 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
}
private boolean ignoreExistingProfile(IProfile profile) {
- if (!Boolean.TRUE.toString().equalsIgnoreCase(System.getProperty(ECLIPSE_IGNORE_USER_CONFIGURATION)))
+ if (agent.getService(SERVICE_SHARED_INSTALL_NEW_TIMESTAMP) != null)
return false;
String baseTimestamp = getBaseTimestamp(profile.getProfileId());
@@ -294,6 +291,8 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService {
if (installer == null)
return null;
IProfileRegistry registry = (IProfileRegistry) installer.getService(IProfileRegistry.SERVICE_NAME);
+ if (registry == null)
+ return null;
long[] revisions = registry.listProfileTimestamps(id);
if (revisions.length >= 1) {
return Long.toString(revisions[revisions.length - 1]);