diff options
| author | Joachim Lingner <jl@openoffice.org> | 2010-10-27 13:53:26 +0200 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2010-10-27 13:53:26 +0200 |
| commit | d726734faf28f6d84f7f97f25b45e46ffd4c53f4 (patch) | |
| tree | 2dd2be895904eefdef6c143722c09181023c84a8 | |
| parent | f1b79dae76ea0ba3d03854c121cfbd958fe86cee (diff) | |
jl162 #i115180# fix problems with latest java 1.6.0_22 on MacOS 10.6
| -rw-r--r-- | jvmfwk/source/elements.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index a5d8e398947e..37e5891af32b 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -938,7 +938,8 @@ void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo) //nRequirements does not have the flag JFW_REQUIRE_NEEDRESTART the //jvm of the new selected JRE will be started. Old settings (before //OOo 3.3) still contain the flag which can be safely ignored. - nRequirements ^= JFW_REQUIRE_NEEDRESTART; + if (nRequirements & JFW_REQUIRE_NEEDRESTART) + nRequirements ^= JFW_REQUIRE_NEEDRESTART; #endif } else if (xmlStrcmp(cur->name, (xmlChar*) "vendorData") == 0) |