--- a/hotspot/src/share/vm/classfile/classLoader.cpp	Wed Jun 08 18:09:04 2016 +0200
+++ b/hotspot/src/share/vm/classfile/classLoader.cpp	Wed Jun 08 12:50:23 2016 -0700
@@ -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;