Merge "ConnWrapper.java: Fixed sonar issue"