Merge pull request #20197 from theresa-m/findclass_cache_fix_0.48

(0.48) romToRam cache follow up

Author: keithc-ca

runtime/shared_common/shrinit.cpp

@@ -4283,8 +4283,6 @@ j9shr_shutdown(J9JavaVM *vm)
 		J9SharedStringFarm* jclStringFarm = config->jclStringFarm;
 		J9HashTable* urlHashTable = config->jclURLHashTable;
 		J9HashTable* utfHashTable = config->jclUTF8HashTable;
-		J9HashTable *romToRamHashTable = config->romToRamHashTable;
-		omrthread_rwmutex_t romToRamHashTableMutex = config->romToRamHashTableMutex;
 		J9VMThread* currentThread = vm->internalVMFunctions->currentVMThread(vm);
 
 		/* Free all of the cached ClasspathItems */
@@ -4303,6 +4301,15 @@ j9shr_shutdown(J9JavaVM *vm)
 		if (config->jclCacheMutex) {
 			omrthread_monitor_destroy(config->jclCacheMutex);
 		}
+
+		if (NULL != config->romToRamHashTableMutex) {
+			omrthread_rwmutex_destroy(config->romToRamHashTableMutex);
+		}
+
+		if (NULL != config->romToRamHashTable) {
+			hashTableFree(config->romToRamHashTable);
+		}
+
 		j9mem_free_memory(config->sharedAPIObject);
 		j9mem_free_memory(config);
 
@@ -4329,16 +4336,6 @@ j9shr_shutdown(J9JavaVM *vm)
 		if (utfHashTable) {
 			hashTableFree(utfHashTable);
 		}
-		if (NULL != romToRamHashTable) {
-			omrthread_rwmutex_enter_write(romToRamHashTableMutex);
-			config->romToRamHashTable = NULL;
-			config->romToRamHashTableMutex = NULL;
-			if (romToRamHashTable) {
-				hashTableFree(romToRamHashTable);
-			}
-			omrthread_rwmutex_exit_write(romToRamHashTableMutex);
-			omrthread_rwmutex_destroy(romToRamHashTableMutex);
-		}
 
 		/* Kill the string farm */
 

runtime/util/hshelp.c

@@ -2643,9 +2643,9 @@ recreateRAMClasses(J9VMThread * currentThread, J9HashTable * classHashTable, J9H
 		if (!fastHCR) {
 			vmFuncs->hashClassTableDelete(classLoader, J9UTF8_DATA(className), J9UTF8_LENGTH(className));
 			if ((NULL != vm->sharedClassConfig) && (NULL != vm->sharedClassConfig->romToRamHashTable)) {
-				omrthread_rwmutex_enter_write(vm->sharedClassConfig->romToRamHashTableMutex);
 				RomToRamEntry entry;
 				entry.ramClass = originalRAMClass;
+				omrthread_rwmutex_enter_write(vm->sharedClassConfig->romToRamHashTableMutex);
 				hashTableRemove(vm->sharedClassConfig->romToRamHashTable, &entry);
 				omrthread_rwmutex_exit_write(vm->sharedClassConfig->romToRamHashTableMutex);
 			}