update Database.java
Merge branch 'hotfix'