Merge "DBMap.java: Fixed sonar issue"