[WFLY-490][WFLY-2139] Fix circular static variable problem