diff options
| author | Pascal Rapicault (Ericsson) | 2013-02-28 21:29:41 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2013-02-28 21:29:41 +0000 |
| commit | d6c142d4fef005ea6bd122fd7e8806e2262ca9f7 (patch) | |
| tree | 7855cb54f6e4a87f44e3b83b5ebdf30f15e0a04b | |
| parent | 323b7bcd64040dd1471bbc60dbe358af3136eeb1 (diff) | |
| download | rt.equinox.p2-20130228-212941.tar.gz rt.equinox.p2-20130228-212941.tar.xz rt.equinox.p2-20130228-212941.zip | |
Remove unnecessary constant added in M5v20130228-212941
2 files changed, 5 insertions, 2 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 c55f31c77..331d60a13 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 @@ -48,6 +48,9 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService { public static final String DEFAULT_STORAGE_DIR = "profileRegistry"; //$NON-NLS-1$ private static final String DATA_EXT = ".data"; //$NON-NLS-1$ + //Internal constant used to keep track of the newly created timestamp + private static final String SERVICE_SHARED_INSTALL_NEW_TIMESTAMP = IProfileRegistry.class.getName() + '_' + "NEW_SELF_TIMESTAMP"; //$NON-NLS-1$ + protected final IProvisioningAgent agent; /** @@ -106,6 +109,8 @@ public class SimpleProfileRegistry implements IProfileRegistry, IAgentService { self = context.getProperty("eclipse.p2.profile"); //$NON-NLS-1$ } } + if (self == null) + self = (String) agent.getService("FORCED_SELF"); context.ungetService(ref); } diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProfileRegistry.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProfileRegistry.java index b2490c894..e93a856d5 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProfileRegistry.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/p2/engine/IProfileRegistry.java @@ -38,8 +38,6 @@ public interface IProfileRegistry { */ public static final String SERVICE_NAME = IProfileRegistry.class.getName(); - public static final String SERVICE_SHARED_INSTALL_NEW_TIMESTAMP = IProfileRegistry.class.getName() + '_' + "NEW_SELF_TIMESTAMP"; //$NON-NLS-1$ - /** * Return the profile in the registry that has the given id. If it does not exist, * then return <code>null</code>. |