From 6b3450987a801452ef42bfa0b1c1a22eef7a8b84 Mon Sep 17 00:00:00 2001 From: Hang Shao Date: Wed, 16 Oct 2024 14:18:02 -0400 Subject: [PATCH] Fix line endings check failures Signed-off-by: Hang Shao --- runtime/nls/shrc/j9shr.nls | 2 +- runtime/shared_common/CacheMap.cpp | 1 - runtime/shared_common/CompositeCache.cpp | 2 -- runtime/shared_common/CompositeCacheImpl.hpp | 3 +-- .../shareClassTests/SCCMLTests/ShareClassesCMLTests-6.xml | 6 +++--- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/runtime/nls/shrc/j9shr.nls b/runtime/nls/shrc/j9shr.nls index 31777fef153..8cffbbee846 100644 --- a/runtime/nls/shrc/j9shr.nls +++ b/runtime/nls/shrc/j9shr.nls @@ -6965,7 +6965,7 @@ J9NLS_SHRC_SHRINIT_HELPTEXT_EXTRA_STARTUPHINTS_EQUALS.system_action= J9NLS_SHRC_SHRINIT_HELPTEXT_EXTRA_STARTUPHINTS_EQUALS.user_response= # END NON-TRANSLATABLE -J9NLS_SHRC_SHRINIT_OPTION_INVALID_PARAM=Invalid parameter passed to option \"%s\". +J9NLS_SHRC_SHRINIT_OPTION_INVALID_PARAM=Invalid parameter passed to option \"%s\". # START NON-TRANSLATABLE J9NLS_SHRC_SHRINIT_OPTION_INVALID_PARAM.sample_input_1=extraStartupHints= J9NLS_SHRC_SHRINIT_OPTION_INVALID_PARAM.explanation=An incorrect parameter has been used in the command-line option diff --git a/runtime/shared_common/CacheMap.cpp b/runtime/shared_common/CacheMap.cpp index 3551a422923..be0eeb0822a 100644 --- a/runtime/shared_common/CacheMap.cpp +++ b/runtime/shared_common/CacheMap.cpp @@ -7122,4 +7122,3 @@ SH_CacheMap::setExtraStartupHints(J9VMThread* currentThread) CACHEMAP_TRACE1(J9SHR_VERBOSEFLAG_ENABLE_VERBOSE_DEFAULT, J9NLS_INFO, J9NLS_SHRC_CC_EXTRA_STARTUPHINTS_SET, val); _ccHead->exitWriteMutex(currentThread, fnName); } - diff --git a/runtime/shared_common/CompositeCache.cpp b/runtime/shared_common/CompositeCache.cpp index 596bb624305..25cfde59339 100644 --- a/runtime/shared_common/CompositeCache.cpp +++ b/runtime/shared_common/CompositeCache.cpp @@ -6813,5 +6813,3 @@ SH_CompositeCacheImpl::setExtraStartupHints(J9VMThread* currentThread, U_32 val) _theca->extraStartupHints = val; Trc_SHR_CC_setExtraStartupHints_Event(currentThread, val); } - - diff --git a/runtime/shared_common/CompositeCacheImpl.hpp b/runtime/shared_common/CompositeCacheImpl.hpp index 6173de0139c..dda2a7829ff 100644 --- a/runtime/shared_common/CompositeCacheImpl.hpp +++ b/runtime/shared_common/CompositeCacheImpl.hpp @@ -398,7 +398,7 @@ class SH_CompositeCacheImpl : public SH_CompositeCache, public AbstractMemoryPer bool hasReadMutex(J9VMThread* currentThread) const; U_32 getExtraStartupHints(void) const; - + void setExtraStartupHints(J9VMThread* currentThread, U_32 val); private: @@ -585,4 +585,3 @@ class SH_CompositeCacheImpl : public SH_CompositeCache, public AbstractMemoryPer }; #endif /* !defined(COMPOSITECACHEIMPL_H_INCLUDED) */ - diff --git a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-6.xml b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-6.xml index ee9a572b9c8..0c80205e596 100644 --- a/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-6.xml +++ b/test/functional/cmdLineTests/shareClassTests/SCCMLTests/ShareClassesCMLTests-6.xml @@ -976,7 +976,7 @@ corrupt Processing dump event - + $JAVA_EXE$ $currentMode$,extraStartupHints=0 JVMSHRC864I The number of additional startup hints that can be stored into the shared cache is set to 0 @@ -995,7 +995,7 @@ corrupt Processing dump event - + $JAVA_EXE$ $currentMode$,printStats=startuphint STARTUP HINTS KEY: @@ -1009,7 +1009,7 @@ corrupt Processing dump event - + $JAVA_EXE$ $currentMode$,extraStartupHints=32 JVMSHRC864I The number of additional startup hints that can be stored into the shared cache is set to 32