diff options
| author | Christian Walther | 2016-04-01 08:14:19 +0000 |
|---|---|---|
| committer | Thomas Watson | 2021-06-25 13:03:00 +0000 |
| commit | 1105fb3bc1fd3ea22a86a3b1da86bc056415d4c5 (patch) | |
| tree | 4394b06434b9190f87eb8080af84c5aadd91838f | |
| parent | b82c7eb4e77a72e7430dfc5558a9d5c2fca4da3d (diff) | |
| download | rt.equinox.framework-1105fb3bc1fd3ea22a86a3b1da86bc056415d4c5.tar.gz rt.equinox.framework-1105fb3bc1fd3ea22a86a3b1da86bc056415d4c5.tar.xz rt.equinox.framework-1105fb3bc1fd3ea22a86a3b1da86bc056415d4c5.zip | |
Bug 574432 - Allow applications to modify eclipse.allowAppRelaunchY20210630-0410Y20210630-0230Y20210629-0800I20210629-1800I20210629-0210I20210628-1800I20210627-1800I20210626-1800I20210625-1800
Change-Id: I12d93a227efbe80703d33d3473fe7c995fda0d38
Signed-off-by: Christian Walther <walther@indel.ch>
Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.framework/+/182400
Tested-by: Equinox Bot <equinox-bot@eclipse.org>
Reviewed-by: Thomas Watson <tjwatson@us.ibm.com>
2 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java index e310abb63..06049a013 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java @@ -127,7 +127,7 @@ public class EclipseStarter { public static final String PROP_CONSOLE_LOG = "eclipse.consoleLog"; //$NON-NLS-1$ public static final String PROP_IGNOREAPP = "eclipse.ignoreApp"; //$NON-NLS-1$ public static final String PROP_REFRESH_BUNDLES = "eclipse.refreshBundles"; //$NON-NLS-1$ - private static final String PROP_ALLOW_APPRELAUNCH = "eclipse.allowAppRelaunch"; //$NON-NLS-1$ + public static final String PROP_ALLOW_APPRELAUNCH = "eclipse.allowAppRelaunch"; //$NON-NLS-1$ private static final String PROP_APPLICATION_LAUNCHDEFAULT = "eclipse.application.launchDefault"; //$NON-NLS-1$ private static final String FILE_SCHEME = "file:"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java index 2836f03b4..8d65643e4 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/core/runtime/internal/adaptor/EclipseAppLauncher.java @@ -102,6 +102,8 @@ public class EclipseAppLauncher implements ApplicationLauncher { } result = runApplication(defaultContext); + // refresh the allowAppRelaunch setting in case the application changed it + relaunch = Boolean.valueOf(equinoxConfig.getConfiguration(EclipseStarter.PROP_ALLOW_APPRELAUNCH)); } catch (Exception e) { if (!relaunch || (b.getState() & Bundle.ACTIVE) == 0) throw e; |