Merge "Fixed sonar issue in ResourceAllocator.java"