Free ramToRom memory directly

Free ramToRom memory directly instead of through cached variable to ensure null check correct. Signed-off-by: Theresa Mammarella <[email protected]>
eclipse-openj9 · Sep 19, 2024 · 8e3cfc3 · 8e3cfc3
1 parent 02cb848
commit 8e3cfc3
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/runtime/shared_common/shrinit.cpp b/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 */
@@ -4329,15 +4327,13 @@ j9shr_shutdown(J9JavaVM *vm)
 		if (utfHashTable) {
 			hashTableFree(utfHashTable);
 		}
-		if (NULL != romToRamHashTable) {
-			omrthread_rwmutex_enter_write(romToRamHashTableMutex);
+		if (NULL != config->romToRamHashTable) {
+			omrthread_rwmutex_enter_write(config->romToRamHashTableMutex);
+			hashTableFree(config->romToRamHashTable);
 			config->romToRamHashTable = NULL;
+			omrthread_rwmutex_exit_write(config->romToRamHashTableMutex);
+			omrthread_rwmutex_destroy(config->romToRamHashTableMutex);
 			config->romToRamHashTableMutex = NULL;
-			if (romToRamHashTable) {
-				hashTableFree(romToRamHashTable);
-			}
-			omrthread_rwmutex_exit_write(romToRamHashTableMutex);
-			omrthread_rwmutex_destroy(romToRamHashTableMutex);
 		}
 
 		/* Kill the string farm */