My patch once more, based on 'postgresql-jdbc-8.0-311.src.tar.gz'.
(Sorry, my last version of this patch made a NullPointerException!) Using this patch, I still have not found any more problems with my application.
With kind regards,Ingolf.