From 9ccf85ac6a46233695930693cc4c6851c8ba7cb2 Mon Sep 17 00:00:00 2001
From: coleenp <unknown>
Date: Mon, 3 Sep 2012 18:37:12 -0400
Subject: [PATCH] 7195823: NPG: CMS reserved() doesn't match _rs.base().
 Summary: If the commit fails, the size isn't set so the assert fails.
 Reviewed-by: kamg

---
 src/share/vm/memory/metaspace.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/share/vm/memory/metaspace.cpp b/src/share/vm/memory/metaspace.cpp
index 913b90cbf..cea821854 100644
--- a/src/share/vm/memory/metaspace.cpp
+++ b/src/share/vm/memory/metaspace.cpp
@@ -1077,15 +1077,15 @@ bool VirtualSpaceNode::initialize() {
     set_top((MetaWord*)virtual_space()->low());
     set_reserved(MemRegion((HeapWord*)_rs.base(),
                  (HeapWord*)(_rs.base() + _rs.size())));
-  }
 
-  assert(reserved()->start() == (HeapWord*) _rs.base(),
-    err_msg("Reserved start was not set properly " PTR_FORMAT
-      " != " PTR_FORMAT, reserved()->start(), _rs.base()));
-  assert(reserved()->word_size() == _rs.size() / BytesPerWord,
-    err_msg("Reserved size was not set properly " SIZE_FORMAT
-      " != " SIZE_FORMAT, reserved()->word_size(),
-      _rs.size() / BytesPerWord));
+    assert(reserved()->start() == (HeapWord*) _rs.base(),
+      err_msg("Reserved start was not set properly " PTR_FORMAT
+        " != " PTR_FORMAT, reserved()->start(), _rs.base()));
+    assert(reserved()->word_size() == _rs.size() / BytesPerWord,
+      err_msg("Reserved size was not set properly " SIZE_FORMAT
+        " != " SIZE_FORMAT, reserved()->word_size(),
+        _rs.size() / BytesPerWord));
+  }
 
   return result;
 }
-- 
GitLab