Merge

2017-06-28 17:16:42 +02:00 · 2017-06-28 17:16:42 +02:00 · 3771ff5bd4
commit 3771ff5bd4
parent 428063dd5e f96e11d5e1
1 changed files with 1 additions and 1 deletions
--- a/hotspot/src/share/vm/runtime/globals.hpp
+++ b/hotspot/src/share/vm/runtime/globals.hpp
@ -1304,7 +1304,7 @@ public:
  product(bool, UseBiasedLocking, true,                                     \
          "Enable biased locking in JVM")                                   \
                                                                            \
-  product(intx, BiasedLockingStartupDelay, 4000,                            \
+  product(intx, BiasedLockingStartupDelay, 0,                               \
          "Number of milliseconds to wait before enabling biased locking")  \
          range(0, (intx)(max_jint-(max_jint%PeriodicTask::interval_gran))) \
          constraint(BiasedLockingStartupDelayFunc,AfterErgo)               \