fix nullpointru
fix nullpointru
Merge branch 'master' of https://github.com/hon92/Java-Project.git