More general fix for JENA-595.

git-svn-id: https://svn.apache.org/repos/asf/jena/trunk@1545008 13f79535-47bb-0310-9956-ffa450edef68