# HG changeset patch
# User mgerdin
# Date 1382081519 -7200
# Node ID 65e0eb464169bbc46654fdae6f405ee5b6240c30
# Parent  eb9c887bac49934413d6bac3bf568e1796965862
8026698: Incorrect error handling in Metaspace::allocate
Reviewed-by: stefank, jwilhelm

diff -r eb9c887bac49 -r 65e0eb464169 hotspot/src/share/vm/memory/metaspace.cpp
--- a/hotspot/src/share/vm/memory/metaspace.cpp	Tue Oct 15 13:56:46 2013 +0200
+++ b/hotspot/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.