Merge "fixed sonar issues in DBResourceManager.java"