diff src/share/vm/runtime/objectMonitor.hpp @ 14318:1020b892787b

Merge
author hseigel
date Sun, 02 Feb 2014 15:31:40 -0500
parents 63a4eb8bcd23
children 4ca6dc0799b6
line wrap: on
line diff
--- a/src/share/vm/runtime/objectMonitor.hpp	Thu Jan 30 14:12:22 2014 -0800
+++ b/src/share/vm/runtime/objectMonitor.hpp	Sun Feb 02 15:31:40 2014 -0500
@@ -101,7 +101,7 @@
   static int Spinner_offset_in_bytes()     { return offset_of(ObjectMonitor, _Spinner);    }
 
  public:
-  // Eventaully we'll make provisions for multiple callbacks, but
+  // Eventually we'll make provisions for multiple callbacks, but
   // now one will suffice.
   static int (*SpinCallbackFunction)(intptr_t, int) ;
   static intptr_t SpinCallbackArgument ;
@@ -272,7 +272,7 @@
   // type int, or int32_t but not intptr_t.  There's no reason
   // to use 64-bit fields for these variables on a 64-bit JVM.
 
-  volatile intptr_t  _count;        // reference count to prevent reclaimation/deflation
+  volatile intptr_t  _count;        // reference count to prevent reclamation/deflation
                                     // at stop-the-world time.  See deflate_idle_monitors().
                                     // _count is approximately |_WaitSet| + |_EntryList|
  protected: