diff options
| author | Arun Thondapu | 2015-01-21 10:23:22 +0000 |
|---|---|---|
| committer | Arun Thondapu | 2015-01-21 10:23:22 +0000 |
| commit | 799caf38b75f121417a57feafa4c5a7b1bf95e4a (patch) | |
| tree | e1140cc9211697a95948b770904ff650dc28ff8f /features/org.eclipse.equinox.executable.feature/library/eclipse.c | |
| parent | 438c27d3a9f11d1f91d4678a9c381a3ed3b1c2c9 (diff) | |
| download | rt.equinox.framework-799caf38b75f121417a57feafa4c5a7b1bf95e4a.tar.gz rt.equinox.framework-799caf38b75f121417a57feafa4c5a7b1bf95e4a.tar.xz rt.equinox.framework-799caf38b75f121417a57feafa4c5a7b1bf95e4a.zip | |
Bug 449990 - [1.9] --launcher.XXMaxPermSize should not passI20150126-0800I20150125-2000
-XX:MaxPermSize= for Oracle VMs >= 8
Change-Id: Ia48f28d9115b04e4772a6a454c6565c0ad57abbb
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature/library/eclipse.c')
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/eclipse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipse.c b/features/org.eclipse.equinox.executable.feature/library/eclipse.c index 2f448daee..1d62c7ede 100644 --- a/features/org.eclipse.equinox.executable.feature/library/eclipse.c +++ b/features/org.eclipse.equinox.executable.feature/library/eclipse.c @@ -968,7 +968,7 @@ static void mergeUserVMArgs(_TCHAR **vmArgs[]) { } static void adjustVMArgs(_TCHAR *javaVM, _TCHAR *jniLib, _TCHAR **vmArgv[]) { - /* Sun VMs need some extra perm gen space */ + /* Sun/Oracle VMs below version 8 need some extra perm gen space */ /* Detecting Sun VM is expensive - only do so if necessary */ if (permGen != NULL) { int specified = 0, i = -1; @@ -981,7 +981,7 @@ static void adjustVMArgs(_TCHAR *javaVM, _TCHAR *jniLib, _TCHAR **vmArgv[]) { } } - if (!specified && isSunVM(javaVM, jniLib)) { + if (!specified && isMaxPermSizeVM(javaVM, jniLib)) { _TCHAR ** oldArgs = *vmArgv; _TCHAR *newArg = malloc((_tcslen(XXPERMGEN) + _tcslen(permGen) + 1) * sizeof(_TCHAR)); _stprintf(newArg, _T_ECLIPSE("%s%s"), XXPERMGEN, permGen); |