Mercurial > hg > release > icedtea7-forest-2.4 > hotspot
changeset 4980:af92fd5e046e
Merge
author | asaha |
---|---|
date | Wed, 18 Sep 2013 11:30:44 -0700 |
parents | 143a99671e52 (current diff) c75d07d80623 (diff) |
children | ab8db063dccc |
files | .hgtags |
diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Sep 18 11:17:11 2013 -0700 +++ b/.hgtags Wed Sep 18 11:30:44 2013 -0700 @@ -569,6 +569,7 @@ eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43 af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60 efaa26fb6de2ecb8506fb8b785a429d040e96768 jdk7u40-b61 +df6f37a7311d35072a07c1425a7aadee469a09b6 jdk7u40-b62 5fb434aa203c32b4551167b922a70e79831ffdf4 jdk7u45-b01 f2039061ba49de742ae88cc3123fd1237965d665 jdk7u45-b02 d6fd3f84a30ce82a37fc39b6e5e9d73bd8054ab2 jdk7u45-b03
--- a/src/share/vm/services/gcNotifier.cpp Wed Sep 18 11:17:11 2013 -0700 +++ b/src/share/vm/services/gcNotifier.cpp Wed Sep 18 11:30:44 2013 -0700 @@ -209,7 +209,7 @@ GCNotificationRequest *request = getRequest(); if (request != NULL) { NotificationMark nm(request); - Handle objGcInfo = createGcInfo(request->gcManager, request->gcStatInfo, THREAD); + Handle objGcInfo = createGcInfo(request->gcManager, request->gcStatInfo, CHECK); Handle objName = java_lang_String::create_from_str(request->gcManager->name(), CHECK); Handle objAction = java_lang_String::create_from_str(request->gcAction, CHECK);