Merge "CredDAO.java -Extract the assignment out of expression"