1. mst
  2. ooo340

Commits

Joachim Lingner  committed 5de20e0

jl162 #i115180# fix problems with latest java 1.6.0_22 on MacOS 10.6

  • Participants
  • Parent commits bfd8a62
  • Branches default

Comments (0)

Files changed (1)

File jvmfwk/source/elements.cxx

View file
  • Ignore whitespace
             //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)