Java files conn consistency

Executed All tests for Java. No regressions.