changeset 39225:ff6081f6f96b

Merge
author jiangli
date Thu, 09 Jun 2016 00:53:07 +0200
parents 7c26725c0813 af5506aae343
children 8151452e26b2
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/classfile/classLoader.cpp	Wed Jun 08 18:47:05 2016 -0400
+++ b/hotspot/src/share/vm/classfile/classLoader.cpp	Thu Jun 09 00:53:07 2016 +0200
@@ -380,7 +380,6 @@
 
     if (is_multi_ver) {
       int n;
-      ResourceMark rm(THREAD);
       char* entry_name = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, JVM_MAXPATHLEN);
       if (version > 0) {
         n = jio_snprintf(entry_name, JVM_MAXPATHLEN, "META-INF/versions/%d/%s", version, name);
@@ -400,6 +399,7 @@
           }
         }
       }
+      FREE_RESOURCE_ARRAY(char, entry_name, JVM_MAXPATHLEN);
     }
   }
   return buffer;