# HG changeset patch
# User mgerdin
# Date 1382081519 -7200
# Node ID 91a88c8450f41624bfd26f5bcf43524b36f2872b
# Parent  1d1ea10fe09ff04aa40b8e01c4c3e2f27e02440a
8026698: Incorrect error handling in Metaspace::allocate
Reviewed-by: stefank, jwilhelm

diff -r 1d1ea10fe09f -r 91a88c8450f4 src/share/vm/memory/metaspace.cpp
--- a/src/share/vm/memory/metaspace.cpp	Tue Oct 15 13:56:46 2013 +0200
+++ b/src/share/vm/memory/metaspace.cpp	Fri Oct 18 09:31:59 2013 +0200
@@ -3345,9 +3345,7 @@
   }
 
   if (result == NULL) {
-    report_metadata_oome(loader_data, word_size, mdtype, THREAD);
-    // Will not reach here.
-    return NULL;
+    report_metadata_oome(loader_data, word_size, mdtype, CHECK_NULL);
   }
 
   // Zero initialize.