From f50f26c40744176ae6f2ace2bd45410130ea75de Mon Sep 17 00:00:00 2001
From: Andrey Loskutov
Date: Tue, 25 Jul 2017 10:03:22 +0200
Subject: Bug 514333 - Preferences store access can lead to unattended
 workspace location initialization

By specifying "osgi.dataAreaRequiresExplicitInit" system
property in the product we enforce strict instance data location
initialization checks. Now if a plugin will try to access instance data
before it is set during startup, startup will fail with a stack trace
pointing to the offending code.

This change requires a change in equinox first, see
https://git.eclipse.org/r/94671.

Change-Id: Ieeeca05f0a2ff36ee94c60cbf200d2acb4b8f285
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
---
 eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product | 2 +-
 eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'eclipse.platform.releng.tychoeclipsebuilder')

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
index d4cbfee7b..ce7619bbb 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
@@ -9,7 +9,7 @@
    <launcherArgs>
       <programArgs>--launcher.defaultAction openFile --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=1.8 -Xms40m -Xmx512m --add-modules=ALL-SYSTEM
+      <vmArgs>-Dosgi.requiredJavaVersion=1.8 -Dosgi.dataAreaRequiresExplicitInit=true -Xms40m -Xmx512m --add-modules=ALL-SYSTEM
       </vmArgs>
       <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product
index 2c0c53966..240a6c014 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.product
@@ -9,7 +9,7 @@
    <launcherArgs>
       <programArgs>--launcher.defaultAction openFile  --launcher.appendVmargs
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=1.8 -Xms256m -Xmx1024m --add-modules=ALL-SYSTEM
+      <vmArgs>-Dosgi.requiredJavaVersion=1.8 -Dosgi.dataAreaRequiresExplicitInit=true -Xms256m -Xmx1024m --add-modules=ALL-SYSTEM
       </vmArgs>
       <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
-- 
cgit v1.2.3