modify null for java
modify null for java