Removed use of safe file in registry cache
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/plugins/PluginRegistry.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/plugins/PluginRegistry.java index 971db47..54fb8df 100644 --- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/plugins/PluginRegistry.java +++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/plugins/PluginRegistry.java
@@ -191,11 +191,9 @@ } public void saveRegistry() throws IOException { IPath path = InternalPlatform.getMetaArea().getRegistryPath(); - IPath tempPath = InternalPlatform.getMetaArea().getBackupFilePathFor(path); - DataOutputStream output = null; try { - output = new DataOutputStream(new BufferedOutputStream(new SafeFileOutputStream(path.toOSString(),tempPath.toOSString()))); + output = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(path.toFile()))); } catch (IOException ioe) { String message = Policy.bind("meta.unableToCreateCache"); IStatus status = new Status(IStatus.ERROR, Platform.PI_RUNTIME, Platform.PLUGIN_ERROR, message, ioe);
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java index 9b68aa0..9874ddc 100644 --- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java +++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/InternalPlatform.java
@@ -62,8 +62,8 @@ // execution options private static final String OPTION_DEBUG = Platform.PI_RUNTIME + "/debug"; private static final String OPTION_DEBUG_SYSTEM_CONTEXT = Platform.PI_RUNTIME + "/debug/context"; - private static final String OPTION_DEBUG_STARTUP = Platform.PI_RUNTIME + "/debug/startup"; - private static final String OPTION_DEBUG_SHUTDOWN = Platform.PI_RUNTIME + "/debug/shutdown"; + private static final String OPTION_DEBUG_STARTUP = Platform.PI_RUNTIME + "/timing/startup"; + private static final String OPTION_DEBUG_SHUTDOWN = Platform.PI_RUNTIME + "/timing/shutdown"; private static final String OPTION_DEBUG_PLUGINS = Platform.PI_RUNTIME + "/registry/debug"; private static final String OPTION_DEBUG_PLUGINS_DUMP = Platform.PI_RUNTIME + "/registry/debug/dump"; @@ -645,7 +645,6 @@ InternalFactory factory = new InternalFactory(problems); IPath path = getMetaArea().getRegistryPath(); - IPath tempPath = getMetaArea().getBackupFilePathFor(path); DataInputStream input = null; registry = null; // augment the plugin path with any additional platform entries @@ -653,7 +652,7 @@ URL[] augmentedPluginPath = getAugmentedPluginPath(pluginPath); if (path.toFile().exists() && cacheRegistry) { try { - input = new DataInputStream(new BufferedInputStream(new SafeFileInputStream(path.toOSString(), tempPath.toOSString()))); + input = new DataInputStream(new BufferedInputStream(new FileInputStream(path.toFile()))); try { long start = System.currentTimeMillis(); RegistryCacheReader cacheReader = new RegistryCacheReader(factory);