equal
deleted
inserted
replaced
2663 if (UseG1GC) { |
2663 if (UseG1GC) { |
2664 FLAG_SET_DEFAULT(ReduceBulkZeroing, false); |
2664 FLAG_SET_DEFAULT(ReduceBulkZeroing, false); |
2665 } |
2665 } |
2666 #endif |
2666 #endif |
2667 |
2667 |
|
2668 // If we are running in a headless jre, force java.awt.headless property |
|
2669 // to be true unless the property has already been set. |
|
2670 // Also allow the OS environment variable JAVA_AWT_HEADLESS to set headless state. |
|
2671 if (os::is_headless_jre()) { |
|
2672 const char* headless = Arguments::get_property("java.awt.headless"); |
|
2673 if (headless == NULL) { |
|
2674 char envbuffer[128]; |
|
2675 if (!os::getenv("JAVA_AWT_HEADLESS", envbuffer, sizeof(envbuffer))) { |
|
2676 if (!add_property("java.awt.headless=true")) { |
|
2677 return JNI_ENOMEM; |
|
2678 } |
|
2679 } else { |
|
2680 char buffer[256]; |
|
2681 strcpy(buffer, "java.awt.headless="); |
|
2682 strcat(buffer, envbuffer); |
|
2683 if (!add_property(buffer)) { |
|
2684 return JNI_ENOMEM; |
|
2685 } |
|
2686 } |
|
2687 } |
|
2688 } |
|
2689 |
2668 if (!check_vm_args_consistency()) { |
2690 if (!check_vm_args_consistency()) { |
2669 return JNI_ERR; |
2691 return JNI_ERR; |
2670 } |
2692 } |
2671 |
2693 |
2672 return JNI_OK; |
2694 return JNI_OK; |
2983 |
3005 |
2984 if (PrintFlagsFinal) { |
3006 if (PrintFlagsFinal) { |
2985 CommandLineFlags::printFlags(); |
3007 CommandLineFlags::printFlags(); |
2986 } |
3008 } |
2987 |
3009 |
|
3010 // Apply CPU specific policy for the BiasedLocking |
|
3011 if (UseBiasedLocking) { |
|
3012 if (!VM_Version::use_biased_locking() && |
|
3013 !(FLAG_IS_CMDLINE(UseBiasedLocking))) { |
|
3014 UseBiasedLocking = false; |
|
3015 } |
|
3016 } |
|
3017 |
2988 return JNI_OK; |
3018 return JNI_OK; |
2989 } |
3019 } |
2990 |
3020 |
2991 int Arguments::PropertyList_count(SystemProperty* pl) { |
3021 int Arguments::PropertyList_count(SystemProperty* pl) { |
2992 int count = 0; |
3022 int count = 0; |