Feature #1791: Fix Java oca