TRUNK-2663 Fixed static access sonar issue