OPENJPA-2330: Stackoverflow due to endless recursive calls - back ported to 2.1.x Rick Cutis's changes to trunk.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.1.x@1539086 13f79535-47bb-0310-9956-ffa450edef68