diff options
| author | Thomas Watson | 2010-02-19 22:23:28 +0000 |
|---|---|---|
| committer | Thomas Watson | 2010-02-19 22:23:28 +0000 |
| commit | b4f7c1756a7880a1f5dafd18f362a3c3e5b56ae0 (patch) | |
| tree | 043a52073d159beef6fe20d0641f49767822e7df /bundles/org.eclipse.osgi/eclipseAdaptor | |
| parent | 5c339be3bf9b33e79407137143ea1e717cb1ddf4 (diff) | |
| download | rt.equinox.framework-b4f7c1756a7880a1f5dafd18f362a3c3e5b56ae0.tar.gz rt.equinox.framework-b4f7c1756a7880a1f5dafd18f362a3c3e5b56ae0.tar.xz rt.equinox.framework-b4f7c1756a7880a1f5dafd18f362a3c3e5b56ae0.zip | |
Bug 303071 - The framework should fail to launch if the storage area (configuration) cannot be locked
Diffstat (limited to 'bundles/org.eclipse.osgi/eclipseAdaptor')
| -rw-r--r-- | bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java index 9a4ea4d53..4a4a7e0a1 100644 --- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java +++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2003, 2009 IBM Corporation and others. + * Copyright (c) 2003, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -214,8 +214,10 @@ public class EclipseStarter { } } // we only get here if an error happened - FrameworkProperties.setProperty(PROP_EXITCODE, "13"); //$NON-NLS-1$ - FrameworkProperties.setProperty(PROP_EXITDATA, NLS.bind(EclipseAdaptorMsg.ECLIPSE_STARTUP_ERROR_CHECK_LOG, log == null ? null : log.getFile().getPath())); + if (FrameworkProperties.getProperty(PROP_EXITCODE) == null) { + FrameworkProperties.setProperty(PROP_EXITCODE, "13"); //$NON-NLS-1$ + FrameworkProperties.setProperty(PROP_EXITDATA, NLS.bind(EclipseAdaptorMsg.ECLIPSE_STARTUP_ERROR_CHECK_LOG, log == null ? null : log.getFile().getPath())); + } return null; } |