don't break in linux
Merge branch 'java_fix'

* java_fix:
  don't break in linux