Merge

2012-06-25 18:59:52 -07:00 · 2012-06-25 18:59:52 -07:00 · e53644ef78
commit e53644ef78
parent dc5fe663cb 4ea5b30610
1 changed files with 1 additions and 1 deletions
--- a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp
@ -585,7 +585,7 @@ class CallbackWrapper : public StackObj {
    _o = klassOop_if_java_lang_Class(o);

    // object size
-    _obj_size = _o->size() * wordSize;
+    _obj_size = (jlong)_o->size() * wordSize;

    // record the context
    _tag_map = tag_map;