Merge "Attrib.java: Fixed sonar issue"