Merge
authordsamersoff
Wed, 28 May 2014 15:03:36 +0000
changeset 24829 ce92ec4efb1a
parent 24827 82b56982e1af (diff)
parent 24828 dd5406c950a1 (current diff)
child 24830 2fbbde433861
Merge
--- a/hotspot/src/share/vm/memory/allocation.cpp	Wed May 28 07:36:32 2014 -0700
+++ b/hotspot/src/share/vm/memory/allocation.cpp	Wed May 28 15:03:36 2014 +0000
@@ -563,6 +563,7 @@
   _chunk = new (alloc_failmode, len) Chunk(len);
 
   if (_chunk == NULL) {
+    _chunk = k;                 // restore the previous value of _chunk
     return NULL;
   }
   if (k) k->set_next(_chunk);   // Append new chunk to end of linked list