Merge pull request #407 from taka-no-me:fix_java_after_surf_change