Merge "DBSingleton.java: Fixed sonar issue"