changeset 4998:ca681a7f3a26

Merge
author asaha
date Thu, 12 Sep 2013 08:08:06 -0700
parents ed1505510ea0 81bc06715f6c
children 962bde0be11c
files .hgtags make/hotspot_version
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Sep 11 11:12:16 2013 -0700
+++ b/.hgtags	Thu Sep 12 08:08:06 2013 -0700
@@ -568,6 +568,7 @@
 b8d8caf6df744d5342b5d284376a005e86c0b108 hs24-b56
 eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43
 af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
+efaa26fb6de2ecb8506fb8b785a429d040e96768 jdk7u40-b61
 5fb434aa203c32b4551167b922a70e79831ffdf4 jdk7u45-b01
 f2039061ba49de742ae88cc3123fd1237965d665 jdk7u45-b02
 d6fd3f84a30ce82a37fc39b6e5e9d73bd8054ab2 jdk7u45-b03
--- a/src/share/vm/services/gcNotifier.cpp	Wed Sep 11 11:12:16 2013 -0700
+++ b/src/share/vm/services/gcNotifier.cpp	Thu Sep 12 08:08:06 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -211,9 +211,9 @@
     NotificationMark nm(request);
     Handle objGcInfo = createGcInfo(request->gcManager, request->gcStatInfo, THREAD);
 
-    Handle objName = java_lang_String::create_from_platform_dependent_str(request->gcManager->name(), CHECK);
-    Handle objAction = java_lang_String::create_from_platform_dependent_str(request->gcAction, CHECK);
-    Handle objCause = java_lang_String::create_from_platform_dependent_str(request->gcCause, CHECK);
+    Handle objName = java_lang_String::create_from_str(request->gcManager->name(), CHECK);
+    Handle objAction = java_lang_String::create_from_str(request->gcAction, CHECK);
+    Handle objCause = java_lang_String::create_from_str(request->gcCause, CHECK);
 
     klassOop k = Management::sun_management_GarbageCollectorImpl_klass(CHECK);
     instanceKlassHandle gc_mbean_klass(THREAD, k);