[ooo-build-commit] .: Branch 'ooo-build-3-2' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                                        |    6 +
 patches/dev300/jvmfwk-sunjavaplugin-default-stack-size.diff |   54 ++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)

New commits:
commit 1758d1995ee379518e2eb9653cb1b504da96cac9
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Jan 21 17:06:44 2010 +0100

    Increase the default java stack size to 1MB (bnc#572372)
    
    * patches/dev300/jvmfwk-sunjavaplugin-default-stack-size.diff:
    * patches/dev300/apply: increase the default java stack size to 1MB;
      it helps to avoid a crash and a memory corruption reported by valgrind
      (bnc#572372)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a9c1b32..432e351 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -289,6 +289,10 @@ sc-cellsuno-avoid-early-destruction.diff, i#90076, pmladek
 # idlc/regmerge runs in offapi build
 registry-speed-fix.diff, thorsten
 
+# increase the default java stack size to 1MB
+# it helps to avoid some crashes
+jvmfwk-sunjavaplugin-default-stack-size.diff, n#572372, pmladek
+
 [ TemporaryHacks and not MacOSXOnly ]
 
 # don't lstat() that much while creating absolute URLs - breaks unopkg
@@ -396,7 +400,7 @@ pdfimport-no-license.diff
 build-java-target-extensions.diff, i#93115, pmladek
 sdext-minimizer-docked.diff, thorsten
 # fix order of the IF/THEN conditionals
-sdext-presenter-makefile.diff, pmladek
+sdext-presenter-makefile.diff, i#108486, pmladek
 
 [ NovellOnlyExtensionFixes ]
 # allow build with ant-1.6
diff --git a/patches/dev300/jvmfwk-sunjavaplugin-default-stack-size.diff b/patches/dev300/jvmfwk-sunjavaplugin-default-stack-size.diff
new file mode 100644
index 0000000..57939f1
--- /dev/null
+++ b/patches/dev300/jvmfwk-sunjavaplugin-default-stack-size.diff
@@ -0,0 +1,54 @@
+--- jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx.old	2010-01-10 08:36:00.000000000 +0100
++++ jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx	2010-01-21 16:43:06.000000000 +0100
+@@ -530,7 +530,7 @@ javaPluginError jfw_plugin_startJavaVirt
+     JavaVMInitArgs vm_args;
+ 
+     boost::scoped_array<JavaVMOption> sarOptions(
+-        new JavaVMOption[cOptions + 1]);
++        new JavaVMOption[cOptions + 2]);
+     JavaVMOption * options = sarOptions.get();
+     
+     // We set an abort handler which is called when the VM calls _exit during
+@@ -539,6 +539,8 @@ javaPluginError jfw_plugin_startJavaVirt
+     // all versions below 1.5.1
+     options[0].optionString= (char *) "abort";
+     options[0].extraInfo= (void* )(sal_IntPtr)abort_handler;
++    options[1].optionString= (char *) "-Xss1m";
++    options[1].extraInfo= NULL;
+     rtl::OString sClassPathProp("-Djava.class.path=");
+     rtl::OString sClassPathOption;
+     for (int i = 0; i < cOptions; i++)
+@@ -555,19 +557,19 @@ javaPluginError jfw_plugin_startJavaVirt
+                 sClassPathOption = sClassPath + rtl::OString(sep) + sAddPath;
+             else
+                 sClassPathOption = sClassPath;
+-            options[i+1].optionString = (char *) sClassPathOption.getStr();
+-            options[i+1].extraInfo = arOptions[i].extraInfo;
++            options[i+2].optionString = (char *) sClassPathOption.getStr();
++            options[i+2].extraInfo = arOptions[i].extraInfo;
+         }
+         else
+         {
+ #endif        
+-            options[i+1].optionString = arOptions[i].optionString;
+-            options[i+1].extraInfo = arOptions[i].extraInfo;
++            options[i+2].optionString = arOptions[i].optionString;
++            options[i+2].extraInfo = arOptions[i].extraInfo;
+ #ifdef UNX
+         }
+ #endif
+ #if OSL_DEBUG_LEVEL >= 2
+-        JFW_TRACE2(OString("VM option: ") + OString(options[i+1].optionString) +
++        JFW_TRACE2(OString("VM option: ") + OString(options[i+2].optionString) +
+                    OString("\n"));
+ #endif
+     }
+@@ -578,7 +580,7 @@ javaPluginError jfw_plugin_startJavaVirt
+     vm_args.version= JNI_VERSION_1_2;
+ #endif
+     vm_args.options= options;
+-    vm_args.nOptions= cOptions + 1;
++    vm_args.nOptions= cOptions + 2;
+     vm_args.ignoreUnrecognized= JNI_TRUE;
+ 
+     /* We set a global flag which is used by the abort handler in order to