Merge "DBFieldHandler.java: Fixed sonar issue"